From 0a469fa5898ac2b63b860d17ac10c0ebf534d82f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 27 六月 2025 17:49:38 +0800
Subject: [PATCH] zjh20250627
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 231 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 177 insertions(+), 54 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 7d7c76a..2230d62 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
@@ -13,6 +13,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
@@ -25,6 +26,7 @@
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
+import com.ltkj.hosp.vo.ProFcListVo;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.hosp.vodomain.UpdateOrderRemarkVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
@@ -353,6 +355,17 @@
}
return list;
}
+
+
+ @PostMapping("/newaddOrderYcXmJyByTjh")
+ @ApiOperation(value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿(鍗曚釜)")
+ public AjaxResult newaddOrderYcXmJyByTjh(@RequestBody TjOrderYcxm ycxm) {
+
+ ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
+ ycxmService.saveOrUpdate(ycxm);
+ return AjaxResult.success();
+ }
+
/**
@@ -753,15 +766,23 @@
String resultMsg = "";
if (null != baoGaoDans && !baoGaoDans.isEmpty()) {
Date dates = new Date();
- Map<String, Object> map = new HashMap<>();
- map.put("his_registration_id", order.getCardId());
- map.put("ksbm", "");
- map.put("pationid", "");
- map.put("ksrq", DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
- map.put("jsrq", DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
- map.put("pagecount", 10);
- map.put("page", 1);
- AjaxResult result = controller.Getlabreportinfo(map);
+ String jytbfs = configService.selectConfigByKey("jytbfs");
+ AjaxResult result;
+ if (StrUtil.isBlank(jytbfs) || jytbfs.equalsIgnoreCase("Y")){
+ Map<String, Object> map = new HashMap<>();
+ map.put("his_registration_id", order.getCardId());
+ map.put("ksbm", "");
+ map.put("pationid", "");
+ map.put("ksrq", DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
+ map.put("jsrq", DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
+ map.put("pagecount", 10);
+ map.put("page", 1);
+ result = controller.Getlabreportinfo(map);
+ }else {
+ result = ltkjHysqdService.getAsyncDataByPro("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
+ }
+ log.info("妫�楠岄」鐩煡璇㈣繑鍥炲��: " + JSONUtil.toJsonStr(result));
+
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -777,19 +798,19 @@
boolean isInsertHysqd = false;
LtkjHysqd hysqd = new LtkjHysqd();
hysqd.setTjh(order.getCardId());
- hysqd.setTmh(jsonObject.getStr("JYBGID"));
- hysqd.setBbbh(jsonObject.getStr("BBDM"));
- hysqd.setBbmc(jsonObject.getStr("BBMC"));
- hysqd.setXmid(jsonObject.getStr("JYXMDM"));
- hysqd.setXmmc(jsonObject.getStr("JYXMMC"));
- hysqd.setSqsj(jsonObject.getStr("SQRQ"));
- hysqd.setSqys(jsonObject.getStr("SQRBH"));
- hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
- hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
- hysqd.setSqdh(jsonObject.getStr("SQDBH"));
- hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
- hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
- hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
+ hysqd.setTmh(jsonObject.getStr("JYBGID"));// 妫�楠屾姤鍛� ID
+ hysqd.setBbbh(jsonObject.getStr("BBDM"));// 鏍囨湰浠ｇ爜
+ hysqd.setBbmc(jsonObject.getStr("BBMC"));// 鏍囨湰鍚嶇О
+ hysqd.setXmid(jsonObject.getStr("JYXMDM"));// 妫�楠岄」鐩唬鐮�
+ hysqd.setXmmc(jsonObject.getStr("JYXMMC"));// 妫�楠岄」鐩悕绉�
+ hysqd.setSqsj(jsonObject.getStr("SQRQ"));// 鐢宠鏃堕棿
+ hysqd.setSqys(jsonObject.getStr("SQRBH"));// 鐢宠鍖荤敓缂栧彿
+ hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));// 鎶ュ憡鏃ユ湡
+ hysqd.setSqrxm(jsonObject.getStr("SQRXM"));// 鐢宠鍖荤敓濮撳悕
+ hysqd.setSqdh(jsonObject.getStr("SQDBH"));// 鐢宠鍖荤敓浠ｇ爜锛屽瓧鍏镐唬鐮�
+ 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);
@@ -820,13 +841,13 @@
/*鍚屾妫�鏌� his瀛樺偍杩囩▼*/
String jctbfs = configService.selectConfigByKey("jctbfs");
AjaxResult results = null;
- if (jctbfs.equalsIgnoreCase("Y")) {
+ if (StrUtil.isBlank(jctbfs) || jctbfs.equalsIgnoreCase("Y")) {
results = service.getHISDataNew("Getexamreportinfo", maps);
} else {
results = jcsqdService.getTjJcProByHisCall("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
DynamicDataSourceContextHolder.clearDataSourceType();
}
- log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: " + results.toString());
+ log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: " + JSONUtil.toJsonStr(results));
if (Integer.parseInt(results.get("code").toString()) == 200) {
List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
if (null != datas && !datas.isEmpty()) {
@@ -870,30 +891,31 @@
jcbgdService.save(jcbgd);
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- List<LtkjExamJcsqd> jcsqdList = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
- jcycxmService.deletedByTjh(order.getTjNumber());
- if(!jcsqdList.isEmpty()){
- for (LtkjExamJcsqd jcsqd : jcsqdList) {
- if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
- for (String jg : split) {
- if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
- && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
- && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
- TjJcycxm jcycxm=new TjJcycxm();
- jcycxm.setTjh(order.getTjNumber());
- jcycxm.setYqid("jczyy");
- String[] split1 = jcsqd.getJcxmid().split(";");
- jcycxm.setProId(split1[0]);
- jcycxm.setProName(jcsqd.getJcxmmc());
- jcycxm.setCreateTime(new Date());
- jcycxm.setJcjg(jg);
- jcycxmService.save(jcycxm);
- }
- }
- }
- }
- }
+// List<LtkjExamJcsqd> jcsqdList = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
+// jcycxmService.deletedByTjh(order.getTjNumber());
+// if(!jcsqdList.isEmpty()){
+// for (LtkjExamJcsqd jcsqd : jcsqdList) {
+// if(StringUtil.isNotBlank(jcsqd.getJgzt())){
+// String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+// for (String jg : split) {
+// if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+// && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+// && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
+// TjJcycxm jcycxm=new TjJcycxm();
+// jcycxm.setTjh(order.getTjNumber());
+// jcycxm.setYqid("jczyy");
+// String[] split1 = jcsqd.getJcxmid().split(";");
+// jcycxm.setProId(split1[0]);
+// jcycxm.setProName(jcsqd.getJcxmmc());
+// jcycxm.setCreateTime(new Date());
+// jcycxm.setJcjg(jg);
+// jcycxmService.save(jcycxm);
+// }
+// }
+// }
+// }
+// }
+ configController.tjjcycxm(tjNumber, "0");
testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
} else {
resultMsg += "\n妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!";
@@ -1041,7 +1063,8 @@
@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) {
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime,
+ @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tjCategory) {
// String config = configService.selectConfigByKey("tj_confirm");
// DateTime beginTimes = null;
// DateTime endTimes = null;
@@ -1138,7 +1161,7 @@
if (name == null) name = "";
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
- return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
+ return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,tjCategory));
}
@@ -1265,7 +1288,9 @@
// @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) {
+ @ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus,
+ @ApiParam(value = "鑱屼笟缁撹") @RequestParam(required = false) String zhiyeJl,
+ @ApiParam(value = "鑱屼笟缁撴灉") @RequestParam(required = false) String zhiyeJg) {
String config = configService.selectConfigByKey("sfjcwjhyqxm");
if (null != config && config.equalsIgnoreCase("Y")) {
@@ -1287,6 +1312,10 @@
tjOrder.setCheckTime(date);
tjOrder.setStatus(401);
tjOrder.setFinishTime(date);
+ if (StrUtil.isNotBlank(zhiyeJl))
+ tjOrder.setZhiyeJl(zhiyeJl);
+ if (StrUtil.isNotBlank(zhiyeJg))
+ tjOrder.setZhiyeJg(zhiyeJg);
if (orderService.updateById(tjOrder)) {
TjCustomer customer = customerService.getById(tjOrder.getUserId());
if (null != customer) {
@@ -1536,6 +1565,8 @@
parent.put("parentId", remark.getProsId());
parent.put("xmlb", remark.getXmlb());
parent.put("", remark.getXmlb());
+ parent.put("zhiyejl",one.getZhiyeJl());
+ parent.put("zhiyejg", one.getZhiyeJg());
List<TjOrderDetail> dels = new ArrayList<>();
if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
@@ -1579,7 +1610,12 @@
} catch (NumberFormatException ignored) {
}
} else {
- tjOrderDetail.setYcbz("");
+// tjOrderDetail.setYcbz("");
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("");
+
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("鈫�");
tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
@@ -1812,10 +1848,11 @@
}
} else {
- String[] split = tjOrderDetail.getProResult().split("銆倈锛泑;|,|锛�");
+ String[] split = tjOrderDetail.getProResult().split("[銆�,锛�:锛�.\\s]+");
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "").replaceAll(" ","")
+ .replaceAll("鐥�","").replaceAll("[0-9]", "");
Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb);
if (null != maps && !maps.isEmpty()) {
Object bt = maps.get("bt");
@@ -2031,4 +2068,90 @@
}
+ /**
+ * 鏌ヨ澶嶆煡椤圭洰鍒楄〃
+ * @param tjNum 浣撴鍙�
+ * @param type 澶嶆煡鐘舵�� 0鏈鏌ョ姸鎬� 1澶嶆煡鐘舵��
+ * @return
+ */
+ @GetMapping("/getFcList")
+ public AjaxResult getFcList(@RequestParam("tjNum") String tjNum,@RequestParam("type") Integer type){
+ TjOrder order = orderService.getOrderByTjNum(tjNum);
+ if (order == null)
+ return AjaxResult.error();
+ List<ProFcListVo> list = detailService.getFcList(order.getOrderId(),type);
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 澶嶆煡椤圭洰鎻愪氦
+ * @param json
+ * @return
+ */
+ @PostMapping("/UpdFcPro")
+ public AjaxResult updFcPro(@RequestBody String json) {
+ return detailService.updFcPro(json);
+ }
+
+
+
+ @GetMapping("/zongjianyishengHuiFuyichangxiangmu")
+ @ApiOperation(value = "鎬绘鎭㈠寮傚父椤圭洰鎺ュ彛")
+ public AjaxResult zongjianyishengHuiFuyichangxiangmu(@RequestParam String tjNum) {
+
+ List<TjOrderYcxm> list = ycxmService.zongjianyishengHuiFuyichangxiangmu(tjNum);
+ return AjaxResult.success(list);
+ }
+
+
+ @GetMapping("/zongjianyishengHuiFuyichangxiangmuanniu")
+ @ApiOperation(value = "鎬绘鎭㈠寮傚父椤圭洰鎸夐挳鎺ュ彛")
+ public AjaxResult zongjianyishengHuiFuyichangxiangmuanniu(@RequestParam String id) {
+
+ int a = ycxmService.zongjianyishengHuiFuyichangxiangmuanniu(id);
+ return AjaxResult.success(a);
+ }
+
+
+ @GetMapping("/zongjianyishengCheDiShanChuyichangxiangmuanniu")
+ @ApiOperation(value = "鎬绘褰诲簳鍒犻櫎寮傚父椤圭洰鎸夐挳鎺ュ彛")
+ public AjaxResult zongjianyishengCheDiShanChuyichangxiangmuanniu(@RequestParam String id) {
+
+ int a = ycxmService.zongjianyishengCheDiShanChuyichangxiangmuanniu(id);
+ return AjaxResult.success(a);
+ }
+
+
+
+ @GetMapping("/csymxmxzqtyybcjk")
+ @ApiOperation(value = "鍒濆椤甸潰椤圭洰閫夋嫨鍏朵粬鍘熷洜淇濆瓨鎺ュ彛")
+ @Transactional
+ public AjaxResult csymxmxzqtyybcjk(@RequestParam @ApiParam("浣撴鍙�") String tjNum,@RequestParam @ApiParam("椤圭洰ID") String proId,
+ @RequestParam @ApiParam("鍘熷洜") String yy) {
+
+ try {
+ String czydm = SecurityUtils.getUsername();
+ String czy = SecurityUtils.getLoginUser().getUser().getNickName();
+ TjProject tjProject = projectService.getById(proId);
+ if(null != tjProject){
+ SysDept dept = deptService.getById(tjProject.getDeptId());
+
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNum);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = orderRemarkService.getOne(wq);
+ remark.setType(1);
+ if (orderRemarkService.updateById(remark)) {
+ orderRemarkService.csymxmxzqtyybcjk(tjNum,proId,yy,dept.getOrgType(),czy,czydm);
+ return AjaxResult.success();
+ }
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage());
+ throw new RuntimeException(ex);
+ }
+ return AjaxResult.error();
+ }
+
+
}
--
Gitblit v1.8.0