From 7caeae303d4a93d0af2dc2d2f546987dd192be3c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 21 一月 2025 19:34:34 +0800
Subject: [PATCH] zjh20250121
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 194 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 147 insertions(+), 47 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 90bd1e0..1333268 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
@@ -56,6 +56,7 @@
import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.setClipRect;
+import static org.jeecg.modules.jmreport.dyndb.util.b.a;
/**
* @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞�
@@ -122,49 +123,61 @@
private RedissonClient redissonClient;
@Autowired
private ITjRulesService rulesService;
+ @Autowired
+ private ITjProAdvicerulesService tjProAdvicerulesService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
@GetMapping ("/ceshicc")
@ApiOperation (value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
@RepeatSubmit
// @Transactional
- public AjaxResult ceshicc(String s) {
+ public AjaxResult ceshicc() {
- Map<String,Object> map=new HashMap<>();
- List<List<?>> tjpled = testMapper.tjplUpdateDetatilByVi(map);
- log.info(tjpled.toString());
- Integer object = (Integer) map.get("total");
- return AjaxResult.success(object);
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd1("8003241206085556");
+ 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);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ return AjaxResult.success();
}
- @GetMapping ("/ceshi")
- @ApiOperation (value = "娴嬭瘯璋冪敤lis瑙嗗浘鏁版嵁鎺ュ彛")
- @RepeatSubmit
-// @Transactional
- public AjaxResult ceshi() {
- List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt();
- return AjaxResult.success(ccXZxYyLisJgSt);
- }
+// @GetMapping ("/ceshi")
+// @ApiOperation (value = "娴嬭瘯璋冪敤lis瑙嗗浘鏁版嵁鎺ュ彛")
+// @RepeatSubmit
+//// @Transactional
+// public AjaxResult ceshi() {
+// List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt();
+// return AjaxResult.success(ccXZxYyLisJgSt);
+// }
- @GetMapping ("/pacs")
- @ApiOperation (value = "娴嬭瘯璋冪敤pacs瑙嗗浘鏁版嵁鎺ュ彛")
- @RepeatSubmit
- public AjaxResult pacs() {
- List<Map<String, Object>> ccXZxYyPacsJgSt = testMapper.getCcXZxYyPacsJgSt();
+// @GetMapping ("/pacs")
+// @ApiOperation (value = "娴嬭瘯璋冪敤pacs瑙嗗浘鏁版嵁鎺ュ彛")
+// @RepeatSubmit
+// public AjaxResult pacs() {
+// List<Map<String, Object>> ccXZxYyPacsJgSt = testMapper.getCcXZxYyPacsJgSt();
+//
+// List<LtkjExamJcsqd> list = testMapper.getCcXZxYyPacsLtkjExamJcsqd("");
+//
+// log.info(list.toString());
+//
+// List<LtkjExamJcbgd> list1 = testMapper.getCcXZxYyPacsLtkjExamJcbgd("");
+//
+// log.info(list1.toString());
+//
+// return AjaxResult.success(ccXZxYyPacsJgSt);
+// }
- List<LtkjExamJcsqd> list = testMapper.getCcXZxYyPacsLtkjExamJcsqd("");
- log.info(list.toString());
- List<LtkjExamJcbgd> list1 = testMapper.getCcXZxYyPacsLtkjExamJcbgd("");
-
- log.info(list1.toString());
-
- return AjaxResult.success(ccXZxYyPacsJgSt);
- }
@GetMapping ("/getOperationPermissionsByTjNum")
@ApiOperation (value = "(鍒濆椤甸潰 鍜� 鍖荤敓椤甸潰)鏍规嵁浣撴鍙疯幏鍙栨槸鍚﹀彲鎿嶄綔鏉冮檺鎺ュ彛 true鍙搷浣� 鍙嶄箣涓嶅彲")
@@ -321,7 +334,7 @@
public List<CsProVo> getCsProVos(String tjNumber,boolean sfzpacs) {
List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber,sfzpacs);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
list.sort(new Comparator<CsProVo>() {
@Override
public int compare(CsProVo o1, CsProVo o2) {
@@ -716,9 +729,9 @@
if ("Y".equals(getInfoFromSqlData)) {
tbhyxm(order);
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
//鍚屾妫�鏌ラ」鐩�
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
asyncService.updateCheckType(order.getTjNumber());
}
@@ -763,6 +776,7 @@
hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
+ hysqd.setCreateTime(new Date());
QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
if (list.isEmpty())
@@ -774,10 +788,10 @@
}
}
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}
/*鍚屾妫�鏌� his鎺ュ彛*/
- if (null != jianChaBaoGaoDan && jianChaBaoGaoDan.size() > 0) {
+ if (null != jianChaBaoGaoDan && !jianChaBaoGaoDan.isEmpty()) {
Map<String, Object> maps = new HashMap<>();
maps.put("his_registration_id", order.getCardId());
maps.put("ksbm", "浣撴涓績");
@@ -829,10 +843,11 @@
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());
jcbgdService.save(jcbgd);
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
@@ -841,7 +856,7 @@
return AjaxResult.success("鍚屾鎴愬姛");
}
//鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
+// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
//妫�鏌�
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
return AjaxResult.success("鍚屾鎴愬姛");
@@ -892,6 +907,7 @@
bgd.setShys(js.getStr("SHRBH"));
bgd.setShysmc(js.getStr("SHRXM"));
bgd.setYcbz(js.getStr("YCTS"));
+ bgd.setCreateTime(new Date());
// bgd.setTpurl(js.getStr(""));
QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
@@ -946,7 +962,7 @@
private void tbhyxm(TjOrder order) {
List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
- if (one != null && one.size() > 0) {
+ if (one != null && !one.isEmpty()) {
for (LtkjHysqd ltkjHysqd : one) {
ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
@@ -955,7 +971,7 @@
ltkjHysqdService.save(ltkjHysqd);
DynamicDataSourceContextHolder.clearDataSourceType();
List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
- if (one1 != null && one1.size() > 0) {
+ if (one1 != null && !one1.isEmpty()) {
DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
ltkjHybgdService.saveBatch(one1);
DynamicDataSourceContextHolder.clearDataSourceType();
@@ -1212,7 +1228,7 @@
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
-
+ Date date = new Date();
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -1224,17 +1240,15 @@
tjOrder.setCheckStatus(checkStatus);
tjOrder.setStatus(TjConstants.TJ_CHECK);
tjOrder.setCheckDoctor(sysUser.getNickName());
- tjOrder.setCheckTime(new Date());
+ tjOrder.setCheckTime(date);
tjOrder.setStatus(401);
+ tjOrder.setFinishTime(date);
if (orderService.updateById(tjOrder)) {
TjCustomer customer = customerService.getById(tjOrder.getUserId());
if (null != customer) {
customer.setCusNumber(customer.getCusNumber() + 1);
+ customer.setCardId("0");
if (customerService.updateById(customer)) {
-// LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
-// wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
-// wqq.eq(TbTransition::getCardId, customer.getCardId());
-// transitionService.remove(wqq);
asyncService.updateCheckType(tjNumber);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@@ -1382,14 +1396,14 @@
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber);
- if (null != remarkList && remarkList.size() > 0) {
+ if (null != remarkList && !remarkList.isEmpty()) {
for (TjOrderRemark remark : remarkList) {
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
parent.put("parent", remark.getProName());
parent.put("parentId", remark.getProId().toString());
List<TjOrderDetail> dels = new ArrayList<>();
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProId().equals(tjOrderDetail.getProId())) {
String ckfw = tjOrderDetail.getStanId();
@@ -1625,7 +1639,53 @@
@ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
if (StrUtil.isNotBlank(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);
+ 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();
+ detail.setProName(ycxm.getJcxm());
+ detail.setProResult(ycxm.getJcjg());
+ detail.setStanId(ycxm.getCkfw());
+ detail.setProAdvice(ycxm.getDw());
+ 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<>();
+ 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);
+ }
+ 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);
+ }
+ return AjaxResult.success(maps);
+ }else {
return zongjianyishengchakanyichangxiangmu(tjNum);
+ }
+
+// return zongjianyishengchakanyichangxiangmu(tjNum);
}
return AjaxResult.error();
}
@@ -1648,10 +1708,31 @@
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
- List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber);
- if(null !=maps && !maps.isEmpty()){
- tjOrderDetail.setAdvices(maps);
+ if(!tjOrderDetail.getDeptId().equals("2")){
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ ,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
+ ,tjOrderDetail.getProName().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);
}
+
}
dels.add(tjOrderDetail);
@@ -1687,5 +1768,24 @@
}
+ @PostMapping ("/addOrderYcXmByTjh")
+ @ApiOperation (value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿")
+ public AjaxResult addOrderYcXmJyByTjh(@RequestBody List<TjOrderYcxm> ycxms) {
+ if(null !=ycxms && !ycxms.isEmpty()){
+ String tjh = ycxms.get(0).getTjh();
+ if(StringUtils.isNotBlank(tjh)){
+ ycxmService.delOrderYcXmJyByTjh(tjh);
+
+ for (TjOrderYcxm ycxm : ycxms) {
+ ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
+ }
+ ycxmService.saveBatch(ycxms);
+ return AjaxResult.success();
+ }
+ }
+ return AjaxResult.error();
+ }
+
+
}
--
Gitblit v1.8.0