From d8f9c8b8cc744ddaefe7144beafc68c8fb8906c3 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 22 四月 2025 17:35:46 +0800
Subject: [PATCH] zjh20250422
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 664 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 383 insertions(+), 281 deletions(-)
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 a86ce15..308051e 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
@@ -67,8 +67,8 @@
* @Date: 2022/12/6 14:29
*/
@RestController
-@RequestMapping ("/check")
-@Api (tags = "AAAAAAAAAAAA鎬绘鍖诲笀鐩稿叧鎺ュ彛")
+@RequestMapping("/check")
+@Api(tags = "AAAAAAAAAAAA鎬绘鍖诲笀鐩稿叧鎺ュ彛")
@Slf4j
public class TjCheckController {
@Resource
@@ -133,24 +133,23 @@
private TjOrderYcxmService ycxmService;
- @GetMapping ("/ceshicc")
- @ApiOperation (value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
+ @GetMapping("/ceshicc")
+ @ApiOperation(value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
@RepeatSubmit
// @Transactional
public AjaxResult ceshicc() {
List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd1("8003241206085556");
- if(null !=jcsqdList && !jcsqdList.isEmpty()){
+ if (null != jcsqdList && !jcsqdList.isEmpty()) {
jcsqdService.deletedLtkjJcsqdByTjhAndTmh("8003241206085556");
jcbgdService.deletedLtkjJcbgdByTjhAndTmh("8003241206085556");
jcsqdService.saveBatch(jcsqdList);
List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd1("8003241206085556");
- if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
+ if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
}
return AjaxResult.success();
}
-
// @GetMapping ("/ceshi")
@@ -181,11 +180,9 @@
// }
-
-
- @GetMapping ("/getOperationPermissionsByTjNum")
- @ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
- public AjaxResult getOperationPermissionsByTjNum(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/getOperationPermissionsByTjNum")
+ @ApiOperation(value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
+ public AjaxResult getOperationPermissionsByTjNum(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
Integer status = order.getStatus();
@@ -200,17 +197,17 @@
}
- @GetMapping ("/getCsList")
- @ApiOperation (value = "鍒濆鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
+ @GetMapping("/getCsList")
+ @ApiOperation(value = "鍒濆鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
@Transactional
- public AjaxResult getCsList(@ApiParam (value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸插鏍�") @RequestParam (required = false) Integer checkStatus,
- @ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
- @ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
- @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
- @ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
- @ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
+ public AjaxResult getCsList(@ApiParam(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸插鏍�") @RequestParam(required = false) Integer checkStatus,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) Long compId,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -301,9 +298,9 @@
/**
* 鍒濆
*/
- @GetMapping ("/cSWebGetProByTjNumAndOrderId")
- @ApiOperation (value = "(鍒濆椤甸潰)鐐瑰嚮浣撴浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
- public AjaxResult cSWebGetProByTjNumAndOrderId(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/cSWebGetProByTjNumAndOrderId")
+ @ApiOperation(value = "(鍒濆椤甸潰)鐐瑰嚮浣撴浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
+ public AjaxResult cSWebGetProByTjNumAndOrderId(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
// List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber);
// List<CsProVo> list = new ArrayList<>();
// if (null != orderRemarkList && orderRemarkList.size() > 0) {
@@ -332,12 +329,12 @@
// });
// }
- List<CsProVo> list = getCsProVos(tjNumber,false);
+ List<CsProVo> list = getCsProVos(tjNumber, false);
return AjaxResult.success(list);
}
- public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) {
- List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs);
+ public List<CsProVo> getCsProVos(String tjNumber, boolean sfzpacs) {
+ List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber, sfzpacs);
if (null != list && !list.isEmpty()) {
list.sort(new Comparator<CsProVo>() {
@Override
@@ -353,12 +350,12 @@
/**
* 鍒濆
*/
- @GetMapping ("/confirmOrder")
- @ApiOperation (value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛")
+ @GetMapping("/confirmOrder")
+ @ApiOperation(value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛")
@Transactional
- public AjaxResult confirmOrder(@ApiParam (value = "tjNumber") @RequestParam String tjNumber,
- @ApiParam (value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam (defaultValue = "0") Integer status,
- @ApiParam (value = "椹冲洖鐞嗙敱") @RequestParam (required = false) String remark) {
+ public AjaxResult confirmOrder(@ApiParam(value = "tjNumber") @RequestParam String tjNumber,
+ @ApiParam(value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status,
+ @ApiParam(value = "椹冲洖鐞嗙敱") @RequestParam(required = false) String remark) {
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("璇锋鏌ユ槸鍚﹀瓨鍦ㄦ湭妫�鎴栧欢鏈熼」鐩�");
if (null != tjNumber) {
@@ -396,8 +393,8 @@
/**
* 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
*/
- @GetMapping ("/dataSynchronization")
- @ApiOperation (value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
+ @GetMapping("/dataSynchronization")
+ @ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
@RepeatSubmit
// @Transactional
public AjaxResult dataSynchronization(@RequestParam String tjNumber, HttpServletRequest request) {
@@ -405,7 +402,7 @@
RLock lock = redissonClient.getLock("lock:check:dataSynchronization:" + tjNumber);
try {
boolean tryLock = lock.tryLock(3L, TimeUnit.SECONDS);
- if (tryLock){
+ if (tryLock) {
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
@@ -634,14 +631,14 @@
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- int maxRetries=3;
+ int maxRetries = 3;
for (int attempt = 0; attempt < maxRetries; attempt++) {
try {
testMapper.updateDetailByTjJcCall(order.getCardId(),
String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
break;
} catch (Exception e) {
- if (attempt==maxRetries-1){
+ if (attempt == maxRetries - 1) {
throw e;
}
try {
@@ -650,20 +647,19 @@
}
}
}
- }else {
+ } else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
}
}
return AjaxResult.success("鍚屾鎴愬姛");
- }
- else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber(),hospId);
- if(null != hysqdList && !hysqdList.isEmpty()){
+ } else if (null != sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")) {
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber(), hospId);
+ if (null != hysqdList && !hysqdList.isEmpty()) {
for (LtkjHysqd hysqd : hysqdList) {
- LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh());
+ LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
if (null != jybgid) {
- ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh());
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh());
}
if (ltkjHysqdService.save(hysqd)) {
@@ -673,27 +669,27 @@
}
DynamicDataSourceContextHolder.clearDataSourceType();
}
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber(),hospId);
- if(null !=jcsqdList && !jcsqdList.isEmpty()){
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber(), hospId);
+ if (null != jcsqdList && !jcsqdList.isEmpty()) {
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
jcsqdService.saveBatch(jcsqdList);
- List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId(),hospId);
- if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
+ List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId(), hospId);
+ if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
}
// String tjNumber1 = order.getTjNumber();
// log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1);
// log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+tjNumber);
- Map<String,Object> map=new HashMap<>();
- map.put("tjnum",tjNumber);
+ Map<String, Object> map = new HashMap<>();
+ map.put("tjnum", tjNumber);
testMapper.tjUpdateDetatilByVi(map);
- }else {
+ } else {
//鍖栭獙
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
}
- //妫�鏌�
- orderService.tjLispacstongbujianyi(null,null,null,null);
+ //妫�鏌�
+ orderService.tjLispacstongbujianyi(null, null, null, null);
return AjaxResult.success("鍚屾鎴愬姛");
}
return AjaxResult.error("鏈煡鍒拌浜哄憳浣撴璁板綍");
@@ -702,25 +698,24 @@
} catch (InterruptedException e) {
e.printStackTrace();
return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
- }finally {
+ } finally {
lock.unlock();
}
}
-
/**
* 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
*/
- @GetMapping ("/dataSynchronizationApi")
- @ApiOperation (value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
+ @GetMapping("/dataSynchronizationApi")
+ @ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
@RepeatSubmit
// @Transactional
public AjaxResult dataSynchronizationApi(@RequestParam String tjNumber) {
RLock lock = redissonClient.getLock("lock:check:dataSynchronization:" + tjNumber);
try {
boolean tryLock = lock.tryLock(3L, TimeUnit.SECONDS);
- if (tryLock){
+ if (tryLock) {
String doctorId = configService.selectConfigByKey("request_default_check_doctorId");
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
@@ -793,7 +788,7 @@
saveHybgd(hysqd);
}
}
- }else {
+ } else {
resultMsg = "鍖栭獙椤圭洰鏆傛椂鏈嚭缁撴灉,璇风◢鍚庡悓姝�!!!";
}
//鍚屾鍖栭獙椤圭洰
@@ -852,12 +847,12 @@
jcbgd.setJcbw(objectMap.get("JCBW").toString());
if (null != objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
- jcbgd.setCreateTime(new Date());
+ jcbgd.setCreateTime(new Date());
jcbgdService.save(jcbgd);
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
- }else {
+ } else {
resultMsg = "妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!";
// return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
@@ -997,17 +992,17 @@
/**
* 鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃
*/
- @GetMapping ("/getList")
- @ApiOperation (value = "鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
+ @GetMapping("/getList")
+ @ApiOperation(value = "鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
// @PreAuthorize("@ss.hasPermi('check:check:getList')")
- public AjaxResult getList(@ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam (required = false) Integer checkStatus,
- @ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
- @ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
- @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
- @ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
- @ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
+ public AjaxResult getList(@ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam(required = false) Integer checkStatus,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) Long compId,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
// String config = configService.selectConfigByKey("tj_confirm");
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -1108,17 +1103,16 @@
}
-
- @GetMapping ("/getBghsList")
- @ApiOperation (value = "鎶ュ憡鏍告敹椤甸潰鏌ヨ鎺ュ彛")//0寰�1宸�
+ @GetMapping("/getBghsList")
+ @ApiOperation(value = "鎶ュ憡鏍告敹椤甸潰鏌ヨ鎺ュ彛")//0寰�1宸�
// @PreAuthorize("@ss.hasPermi('check:check:getList')")
- public AjaxResult getBghsList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
- @ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
- @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
- @ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
- @ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
+ public AjaxResult getBghsList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) Long compId,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
// String config = configService.selectConfigByKey("tj_confirm");
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -1219,7 +1213,6 @@
}
-
/**
* 鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅鎺ュ彛
*
@@ -1228,15 +1221,15 @@
* @param checkStatus
* @return
*/
- @PutMapping ("/getTjdetailList")
- @ApiOperation (value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
+ @PutMapping("/getTjdetailList")
+ @ApiOperation(value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
// @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
- public AjaxResult getTjdetailList(@ApiParam (value = "浣撴tjNumber") @RequestParam String tjNumber,
- @ApiParam (value = "鎬绘寤鸿") @RequestParam (required = false) String advice,
- @ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
+ public AjaxResult getTjdetailList(@ApiParam(value = "浣撴tjNumber") @RequestParam String tjNumber,
+ @ApiParam(value = "鎬绘寤鸿") @RequestParam(required = false) String advice,
+ @ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
String config = configService.selectConfigByKey("sfjcwjhyqxm");
- if(null != config && config.equalsIgnoreCase("Y")){
+ if (null != config && config.equalsIgnoreCase("Y")) {
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
@@ -1281,9 +1274,9 @@
* @param tjNumber
* @return
*/
- @GetMapping ("/updateCheckType")
- @ApiOperation (value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�旈潪鍖栭獙椤圭洰")
- public AjaxResult updateCheckType(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/updateCheckType")
+ @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�旈潪鍖栭獙椤圭洰")
+ public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
// if (redisCache.hasKey("updateCheckType" + tjNumber)) {
// List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
// return AjaxResult.success(cacheMapValue);
@@ -1390,9 +1383,9 @@
* @param tjNumber
* @return
*/
- @GetMapping ("/updateCheckTypeHuaYan")
- @ApiOperation (value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿寲楠岄」鐩�")
- public AjaxResult updateCheckTypeHuaYan(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/updateCheckTypeHuaYan")
+ @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿寲楠岄」鐩�")
+ public AjaxResult updateCheckTypeHuaYan(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
// asyncService.updateCheckType(tjNumber);
List<Map<String, Object>> list = new ArrayList<>();
TjOrder one = orderService.getOrderByTjNum(tjNumber);
@@ -1474,9 +1467,9 @@
}
- @GetMapping ("/updateHYANDCGCheckType")
- @ApiOperation (value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿父瑙勫拰鍖栭獙椤圭洰")
- public AjaxResult updateHYANDCGCheckType(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/updateHYANDCGCheckType")
+ @ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏鈥斺�斺�斺�斿父瑙勫拰鍖栭獙椤圭洰")
+ public AjaxResult updateHYANDCGCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
return getResult(tjNumber);
}
@@ -1509,47 +1502,49 @@
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
String ckfw = tjOrderDetail.getStanId();
- if (null !=ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
+ if (null != ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
}
if (StrUtil.isNotBlank(ckfw)) {
try {
if (ckfw != null && ckfw.contains("-")) {
- Integer.parseInt(tjOrderDetail.getYcbz());
- String[] split = ckfw.split("-");
- BigDecimal min = new BigDecimal(split[0]);
- BigDecimal max = new BigDecimal(split[1]);
- String proResult = tjOrderDetail.getProResult();
- if(null !=proResult){
- BigDecimal jyjgval = new BigDecimal(proResult);
- if (jyjgval.compareTo(min) < 0) {
- tjOrderDetail.setYcbz("鈫�");
- } else if (jyjgval.compareTo(max) > 0) {
- tjOrderDetail.setYcbz("鈫�");
- } else if(proResult.contains("闃�")) {
- tjOrderDetail.setYcbz("");
- }else {
+ Integer.parseInt(tjOrderDetail.getYcbz());
+ String[] split = ckfw.split("-");
+ BigDecimal min = new BigDecimal(split[0]);
+ BigDecimal max = new BigDecimal(split[1]);
+ String proResult = tjOrderDetail.getProResult();
+ if (null != proResult) {
+ BigDecimal jyjgval = new BigDecimal(proResult);
+ if (jyjgval.compareTo(min) < 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else if (jyjgval.compareTo(max) > 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else if (proResult.contains("闃�")) {
+ tjOrderDetail.setYcbz("");
+ } else {
+ tjOrderDetail.setYcbz("");
+ }
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
+ }
+ } else {
tjOrderDetail.setYcbz("");
}
- if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
- tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
- }
- }else {
- tjOrderDetail.setYcbz("");
- }
- }else {
- if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("");
+ } else {
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("");
- if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("鈫�");
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("鈫�");
}
} catch (NumberFormatException ignored) {
}
- }else {
+ } else {
tjOrderDetail.setYcbz("");
tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
- if(remark.getOrgType().equals(tjOrderDetail.getOrgType())){
+ if (remark.getOrgType().equals(tjOrderDetail.getOrgType())) {
dels.add(tjOrderDetail);
}
}
@@ -1564,12 +1559,12 @@
if (dels.isEmpty()) {
continue;
}
- dels=dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+ dels = dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
dels = dels.stream()
- .sorted(Comparator.comparingInt(
- tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
- ))
- .collect(Collectors.toList());
+ .sorted(Comparator.comparingInt(
+ tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+ ))
+ .collect(Collectors.toList());
parent.put("sons", dels);
parent.put("remark", remark.getRemark());
parent.put("jgbx", remark.getJgbx());
@@ -1588,10 +1583,10 @@
}
- @GetMapping ("/getTm")
- @ApiOperation (value = "鑾峰彇鏉＄爜")
+ @GetMapping("/getTm")
+ @ApiOperation(value = "鑾峰彇鏉＄爜")
// @PreAuthorize("@ss.hasPermi('check:check:getTm')")
- public AjaxResult getTm(@ApiParam (value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ public AjaxResult getTm(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
return AjaxResult.success(tjNumber);
}
@@ -1600,8 +1595,8 @@
*
* @return
*/
- @PostMapping ("/checkUpdateOrderRemark")
- @ApiOperation (value = "鎬绘淇敼澶囨敞鎺ュ彛")
+ @PostMapping("/checkUpdateOrderRemark")
+ @ApiOperation(value = "鎬绘淇敼澶囨敞鎺ュ彛")
public AjaxResult checkUpdateOrderRemark(@RequestBody List<UpdateOrderRemarkVo> updateOrderRemarkVos) {
if (null != updateOrderRemarkVos && !updateOrderRemarkVos.isEmpty()) {
for (UpdateOrderRemarkVo remarkVo : updateOrderRemarkVos) {
@@ -1654,196 +1649,305 @@
}
-
- @GetMapping ("/getzongjianyishengchakanyichangxiangmu")
- @ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
+ @GetMapping("/getzongjianyishengchakanyichangxiangmu")
+ @ApiOperation(value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
- if (StrUtil.isNotBlank(tjNum)) {
- TjOrder one = orderService.getOrderByTjNum(tjNum);
+ try {
+ if (StrUtil.isNotBlank(tjNum)) {
+ TjOrder one = orderService.getOrderByTjNum(tjNum);
- if (one == null) {
- return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ if (one == null) {
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
+ yichangxiangmu(tjNum);
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, tjNum);
+ List<TjOrderYcxm> list = ycxmService.list(wq);
+ if (null != list && !list.isEmpty()) {
+ Collections.reverse(list);
+ return getOrderYcxmList(list);
+ } else {
+ return zongjianyishengchakanyichangxiangmu(tjNum);
+ }
}
+ return AjaxResult.error();
+ } catch (Exception ex) {
+ //throw new RuntimeException(ex);
+ log.error(ex.getMessage());
+ return AjaxResult.error();
+ }
+ }
- LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh,tjNum);
- List<TjOrderYcxm> list = ycxmService.list(wq);
- if(null !=list && !list.isEmpty()){
- Collections.reverse(list);
+ private static AjaxResult getOrderYcxmList(List<TjOrderYcxm> list) {
+ try {
+ List<Map<String, Object>> maps = getYcxmMapList(list);
+ if (!maps.isEmpty()) {
+ List<Map<String, Object>> collect1 = maps.stream()
+ .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
+ .collect(Collectors.toList());
+ return AjaxResult.success(collect1);
+ }
+ return AjaxResult.success(maps);
+ } catch (Exception ex) {
+// throw new RuntimeException(ex);
+ log.error(ex.getMessage());
+ return AjaxResult.error();
+ }
+ }
+
+ private static List<Map<String, Object>> getYcxmMapList(List<TjOrderYcxm> list) {
+ try {
Map<String, List<TjOrderYcxm>> map = list.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
List<Map<String, Object>> maps = new ArrayList<>();
for (Map.Entry<String, List<TjOrderYcxm>> entry : map.entrySet()) {
Map<String, Object> parent = new HashMap<>();
List<TjOrderDetail> dels = new ArrayList<>();
for (TjOrderYcxm ycxm : entry.getValue()) {
- TjOrderDetail detail=new TjOrderDetail();
+ TjOrderDetail detail = new TjOrderDetail();
detail.setOrderDetailId(Long.valueOf(ycxm.getId()));
detail.setProName(ycxm.getJcxm());
detail.setProResult(ycxm.getJcjg());
detail.setStanId(ycxm.getCkfw());
detail.setProAdvice(ycxm.getDw());
- List<Map<String,Object>> btnrlist=new ArrayList<>();
+ List<Map<String, Object>> btnrlist = new ArrayList<>();
String jynr = ycxm.getJynr();
JSONArray array = JSONUtil.parseArray(jynr);
for (Object object : array) {
- Map<String,Object> objectMap=new HashMap<>();
+ Map<String, Object> objectMap = new HashMap<>();
JSONObject jsonObject = (JSONObject) object;
String bt = jsonObject.getStr("bt");
String nr = jsonObject.getStr("nr");
- objectMap.put("bt",bt);
- objectMap.put("nr",nr);
- if(null !=bt || null !=nr) btnrlist.add(objectMap);
+ objectMap.put("bt", bt);
+ objectMap.put("nr", nr);
+ if (null != bt || null != nr) btnrlist.add(objectMap);
}
detail.setAdvices(btnrlist);
dels.add(detail);
}
- parent.put("proName",entry.getKey());
- parent.put("jyjc",entry.getValue().get(0).getJyjc());
- parent.put("sone",dels);
- maps.add(parent);
+ parent.put("proName", entry.getKey());
+ parent.put("jyjc", entry.getValue().get(0).getJyjc());
+ parent.put("sone", dels);
+ maps.add(parent);
}
- List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
-
-
- List<Map<String, Object>> collect = mapList.stream()
- .filter(b -> maps.stream()
- .noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌
- .collect(Collectors.toList());
-
-
-
- if(!collect.isEmpty()){
- maps.addAll(collect);
- }
- if(!maps.isEmpty()){
- List<Map<String, Object>> collect1 = maps.stream()
- .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
- .collect(Collectors.toList());
- return AjaxResult.success(collect1);
- }
- return AjaxResult.success(maps);
- }else {
- List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
-// if(mapList.isEmpty()){
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
- return AjaxResult.success(mapList);
+ return maps;
+ } catch (NumberFormatException ex) {
+// throw new RuntimeException(ex);
+ log.error(ex.getMessage());
+ return null;
}
-
-// return zongjianyishengchakanyichangxiangmu(tjNum);
- }
- return AjaxResult.error();
}
+ private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
+ List<Map<String, Object>> list = new ArrayList<>();
+ try {
+ List<TjOrderYcxm> tjOrderYcxms = new ArrayList<>();
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, tjNumber);
+ List<TjOrderYcxm> ycxmList = ycxmService.list(wq);
+ if (null != remarkList && !remarkList.isEmpty()) {
+ for (TjOrderRemark remark : remarkList) {
+ Map<String, Object> parent = new HashMap<>();
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ List<TjOrderDetail> dels = new ArrayList<>();
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+ if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
+ if (!tjOrderDetail.getDeptId().equals("2")) {
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""),
+ tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
+ , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
+ , tjOrderDetail.getProResult());
- @GetMapping ("/delzongjianyishengchakanyichangxiangmu")
- @ApiOperation (value = "鎬绘鍒犻櫎寮傚父椤圭洰鎺ュ彛")
+ if (null != maps && !maps.isEmpty()) {
+ tjOrderDetail.setAdvices(maps);
+ }
+
+ } else {
+ String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ for (String s : split) {
+ s = s.replaceAll("\n", "");
+ // Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+ Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0");
+ if (null != maps && !maps.isEmpty()) {
+ Object bt = maps.get("bt");
+ Object nr = maps.get("nr");
+ if (null != bt || null != nr) mapList.add(maps);
+ }
+ }
+ tjOrderDetail.setAdvices(mapList);
+ }
+
+ }
+ if (null == ycxmList || ycxmList.isEmpty()) {
+ TjOrderYcxm ycxm = new TjOrderYcxm();
+ ycxm.setTjh(tjNumber);
+ ycxm.setParentName(remark.getProName());
+ ycxm.setJcxm(tjOrderDetail.getProName());
+ ycxm.setJcjg(tjOrderDetail.getProResult());
+ ycxm.setCkfw(tjOrderDetail.getStanId());
+ ycxm.setDw(tjOrderDetail.getProAdvice());
+ ycxm.setJynr(JSONUtil.toJsonStr(tjOrderDetail.getAdvices()));
+ ycxm.setJyjc(remark.getJyjc());
+ if (ycxmService.save(ycxm)) {
+ tjOrderYcxms.add(ycxm);
+ }
+ }
+ dels.add(tjOrderDetail);
+ }
+ }
+ if (!dels.isEmpty()) {
+ parent.put("proName", remark.getProName());
+ parent.put("jyjc", remark.getJyjc());
+ parent.put("sone", dels);
+ list.add(parent);
+ }
+ }
+ }
+ if (!tjOrderYcxms.isEmpty()) {
+ Collections.reverse(tjOrderYcxms);
+ return getOrderYcxmList(tjOrderYcxms);
+ }
+
+ }
+ }
+ return AjaxResult.success(list);
+ } catch (Exception ex) {
+// throw new RuntimeException(ex);
+ log.error(ex.getMessage());
+ return AjaxResult.success(list);
+ }
+ }
+
+ private void yichangxiangmu(String tjNumber) {
+ try {
+ List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNumber);
+
+ if(null !=tjOrderYcxmList && !tjOrderYcxmList.isEmpty()){
+
+ List<Map<String, Object>> list = new ArrayList<>();
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ if (null != remarkList && !remarkList.isEmpty()) {
+ for (TjOrderRemark remark : remarkList) {
+ Map<String, Object> parent = new HashMap<>();
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ List<TjOrderDetail> dels = new ArrayList<>();
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+ if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
+ if (!tjOrderDetail.getDeptId().equals("2")) {
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
+ , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
+ , tjOrderDetail.getProResult());
+
+
+ if (null != maps && !maps.isEmpty()) {
+ tjOrderDetail.setAdvices(maps);
+ }
+
+ } else {
+ String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ for (String s : split) {
+ s = s.replaceAll("\n", "");
+ Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0");
+ if (null != maps && !maps.isEmpty()) {
+ Object bt = maps.get("bt");
+ Object nr = maps.get("nr");
+ if (null != bt || null != nr) mapList.add(maps);
+ }
+ }
+ tjOrderDetail.setAdvices(mapList);
+ }
+
+ }
+ dels.add(tjOrderDetail);
+ }
+ }
+ if (!dels.isEmpty()) {
+ parent.put("proName", remark.getProName());
+ parent.put("jyjc", remark.getJyjc());
+ parent.put("sone", dels);
+ list.add(parent);
+ }
+ }
+ }
+ }
+ }
+ List<Map<String, Object>> maps = getYcxmMapList(tjOrderYcxmList);
+ List<Map<String, Object>> collect = list.stream()
+ .filter(b -> maps.stream()
+ .noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌
+ .collect(Collectors.toList());
+
+ if(!collect.isEmpty()){
+ for (Map<String, Object> map : collect) {
+ for (TjOrderDetail detail : (List<TjOrderDetail>) map.get("sone")) {
+ TjOrderYcxm ycxm = new TjOrderYcxm();
+ ycxm.setTjh(tjNumber);
+ ycxm.setParentName(map.get("proName").toString());
+ ycxm.setJcxm(detail.getProName());
+ ycxm.setJcjg(detail.getProResult());
+ ycxm.setCkfw(detail.getStanId());
+ ycxm.setDw(detail.getProAdvice());
+ ycxm.setJynr(JSONUtil.toJsonStr(detail.getAdvices()));
+ ycxm.setJyjc(map.get("jyjc").toString());
+ ycxmService.save(ycxm);
+ }
+ }
+ }
+ }
+
+ } catch (Exception ex) {
+ log.error(ex.getMessage());
+ }
+ }
+
+ @GetMapping("/delzongjianyishengchakanyichangxiangmu")
+ @ApiOperation(value = "鎬绘鍒犻櫎寮傚父椤圭洰鎺ュ彛")
public AjaxResult delzongjianyishengchakanyichangxiangmu(@RequestParam String id) {
ycxmService.removeById(id);
return AjaxResult.success();
}
- private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
-// asyncService.updateCheckType(tjNumber);
- List<Map<String, Object>> list = new ArrayList<>();
- TjOrder order = orderService.getOrderByTjNum(tjNumber);
- if(null !=order){
- List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
- List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
- LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh,tjNumber);
- List<TjOrderYcxm> ycxmList = ycxmService.list(wq);
- if (null != remarkList && !remarkList.isEmpty()) {
- for (TjOrderRemark remark : remarkList) {
- Map<String, Object> parent = new HashMap<>();
- if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
- List<TjOrderDetail> dels = new ArrayList<>();
- for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
- if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
- if(!tjOrderDetail.getDeptId().equals("2")){
- List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
- ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("\\[.*?\\]", ""),tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
- ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("\\[.*?\\]", "")
- ,tjOrderDetail.getProResult());
- if(null !=maps && !maps.isEmpty()){
- tjOrderDetail.setAdvices(maps);
- }
-
- }else {
- String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
- List<Map<String,Object>> mapList=new ArrayList<>();
- for (String s : split) {
- s = s.replaceAll("\n", "");
-// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String,Object> maps= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(),s,"0");
- if(null !=maps && !maps.isEmpty()){
- Object bt = maps.get("bt");
- Object nr = maps.get("nr");
- if(null !=bt || null !=nr) mapList.add(maps);
- }
- }
- tjOrderDetail.setAdvices(mapList);
- }
-
- }
- if(null==ycxmList || ycxmList.isEmpty()){
- TjOrderYcxm ycxm=new TjOrderYcxm();
- ycxm.setTjh(tjNumber);
- ycxm.setParentName(remark.getProName());
- ycxm.setJcxm(tjOrderDetail.getProName());
- ycxm.setJcjg(tjOrderDetail.getProResult());
- ycxm.setCkfw(tjOrderDetail.getStanId());
- ycxm.setDw(tjOrderDetail.getProAdvice());
- ycxm.setJynr(JSONUtil.toJsonStr(tjOrderDetail.getAdvices()));
- ycxm.setJyjc(remark.getJyjc());
- ycxmService.save(ycxm);
- }
-
- dels.add(tjOrderDetail);
- }
- }
- if(!dels.isEmpty()){
- parent.put("proName",remark.getProName());
- parent.put("jyjc",remark.getJyjc());
- parent.put("sone",dels);
- list.add(parent);
- }
- }
- }
-
- }
- }
- return list;
- }
-
- @GetMapping ("/chushenyemianchakanxiangmujieguo")
- @ApiOperation (value = "鍒濆椤甸潰鏌ョ湅椤圭洰缁撴灉鎺ュ彛")
- public AjaxResult chushenyemianchakanxiangmujieguo(@RequestParam String proId,@RequestParam String tjNum) {
- List<Map<String,Object>> maps = projectService.tjCsXmjgcx(tjNum,proId);
+ @GetMapping("/chushenyemianchakanxiangmujieguo")
+ @ApiOperation(value = "鍒濆椤甸潰鏌ョ湅椤圭洰缁撴灉鎺ュ彛")
+ public AjaxResult chushenyemianchakanxiangmujieguo(@RequestParam String proId, @RequestParam String tjNum) {
+ List<Map<String, Object>> maps = projectService.tjCsXmjgcx(tjNum, proId);
return AjaxResult.success(maps);
}
- @GetMapping ("/panduaniscunzaiweijian")
- @ApiOperation (value = "鍒濆椤甸潰鏌ョ湅椤圭洰鍓嶅垽鏂槸鍚﹀叏閮ㄦ湭妫�鎺ュ彛")
+ @GetMapping("/panduaniscunzaiweijian")
+ @ApiOperation(value = "鍒濆椤甸潰鏌ョ湅椤圭洰鍓嶅垽鏂槸鍚﹀叏閮ㄦ湭妫�鎺ュ彛")
public AjaxResult panduaniscunzaiweijian(@RequestParam String tjNum) {
int a = orderRemarkService.panduaniscunzaiweijian(tjNum);
return AjaxResult.success(a);
}
- @PostMapping ("/addOrderYcXmByTjh")
- @ApiOperation (value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿")
+ @PostMapping("/addOrderYcXmByTjh")
+ @ApiOperation(value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿")
public AjaxResult addOrderYcXmJyByTjh(@RequestBody List<TjOrderYcxm> ycxms) {
- if(null !=ycxms && !ycxms.isEmpty()){
+ if (null != ycxms && !ycxms.isEmpty()) {
String tjh = ycxms.get(0).getTjh();
- if(StringUtils.isNotBlank(tjh)){
+ if (StringUtils.isNotBlank(tjh)) {
ycxmService.delOrderYcXmJyByTjh(tjh);
// String szyssy="";
// StringBuilder builders = new StringBuilder();
@@ -1863,16 +1967,14 @@
}
-
- @PostMapping ("/newaddOrderYcXmJyByTjh")
- @ApiOperation (value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿(鍗曚釜)")
+ @PostMapping("/newaddOrderYcXmJyByTjh")
+ @ApiOperation(value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿(鍗曚釜)")
public AjaxResult newaddOrderYcXmJyByTjh(@RequestBody TjOrderYcxm ycxm) {
- ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
- ycxmService.save(ycxm);
- return AjaxResult.success();
+ ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
+ ycxmService.saveOrUpdate(ycxm);
+ return AjaxResult.success();
}
-
}
--
Gitblit v1.8.0