From e6be2f618355fb182d31c3ddc3d19127eea5e723 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 04 八月 2025 17:35:34 +0800
Subject: [PATCH] zjh20250804
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 999 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 522 insertions(+), 477 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 81c1514..bec6c62 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,9 @@
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.SysDictData;
+import com.ltkj.common.core.domain.entity.SysRole;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
@@ -22,6 +25,7 @@
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.dto.CheckUpdateStatusDto;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
@@ -31,6 +35,7 @@
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
+import com.ltkj.system.service.ISysDictDataService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
@@ -46,7 +51,9 @@
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.NoTransactionException;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -88,11 +95,7 @@
@Resource
private ITjOrderRemarkService orderRemarkService;
@Resource
- private ITbTransitionService transitionService;
- @Resource
private ISysUserService userService;
- @Resource
- private RedisCache redisCache;
@Resource
private TjAsyncService asyncService;
@Resource
@@ -103,12 +106,6 @@
private ISysDeptService deptService;
@Resource
private TestMapper testMapper;
- @Resource
- private TjvLtkjvtjpatService tjvLtkjvtjpatService;
- @Resource
- private LtkjMiddleDetailService middleDetailService;
- @Resource
- private LtkjMiddleHeadService headService;
@Resource
private LtkjExamJcbgdService jcbgdService;
@Resource
@@ -134,11 +131,9 @@
@Autowired
private SysConfigController configController;
@Autowired
- private TjJcycxmService jcycxmService;
- @Resource
- private TjXdtgmdjgService xdtgmdjgService;
- @Resource
- private TjXdPictureController pictureController;
+ private TjReportController reportController;
+ @Autowired
+ private ISysDictDataService sysDictDataService;
@GetMapping("/ceshicc")
@ApiOperation(value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
@@ -356,6 +351,17 @@
}
+ @PostMapping("/newaddOrderYcXmJyByTjh")
+ @ApiOperation(value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿(鍗曚釜)")
+ public AjaxResult newaddOrderYcXmJyByTjh(@RequestBody TjOrderYcxm ycxm) {
+
+ ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
+ ycxmService.saveOrUpdate(ycxm);
+ return AjaxResult.success();
+ }
+
+
+
/**
* 鍒濆
*/
@@ -453,15 +459,22 @@
//鍚屾妫�楠�
if (null != baoGaoDans && baoGaoDans.size() > 0) {
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);
+ }
+
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -493,68 +506,71 @@
hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
if (ltkjHysqdService.save(hysqd)) {
- Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("jybgid", hysqd.getTmh());
- AjaxResult bgdres = controller.Getlabdetailinfo(hashMap);
- String result2 = getAjaxResult(bgdres);
- JSONObject object1 = getJSONObject(result2);
- String code1 = object1.getStr("ResultCode");
- if (null != code1 && code1.equals("0")) {
- JSONArray datas = object1.getJSONArray("ResultData");
- for (Object o : datas) {
- JSONObject js = (JSONObject) o;
+ if(StrUtil.isBlank(jytbfs) || jytbfs.equalsIgnoreCase("Y")){
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("jybgid", hysqd.getTmh());
+ AjaxResult bgdres = controller.Getlabdetailinfo(hashMap);
+ String result2 = getAjaxResult(bgdres);
+ JSONObject object1 = getJSONObject(result2);
+ String code1 = object1.getStr("ResultCode");
+ if (null != code1 && code1.equals("0")) {
+ JSONArray datas = object1.getJSONArray("ResultData");
+ for (Object o : datas) {
+ JSONObject js = (JSONObject) o;
// ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jsonObject.getStr("JYBGID"));
- LtkjHybgd bgd = new LtkjHybgd();
- bgd.setTmh(hysqd.getTmh());
- bgd.setJcxmid(js.getStr("JCZBDM"));
- bgd.setJcxm(js.getStr("JCZBMC"));
- bgd.setTdh(js.getStr(""));
- bgd.setJyjg(js.getStr("JCZBJG"));
- bgd.setJgdw(js.getStr("JLDW"));
- bgd.setFwzdz(js.getStr(""));
- bgd.setFwzgz(js.getStr(""));
- bgd.setFwz(js.getStr("CKZFW"));
- bgd.setJysj(js.getStr("BGRQ"));
- bgd.setJyys(js.getStr("JCRBH"));
- bgd.setShsj(js.getStr("BGRQ"));
- bgd.setShsj(js.getStr("BGRQ"));
- bgd.setShys(js.getStr("SHRBH"));
- bgd.setShysmc(js.getStr("SHRXM"));
- bgd.setYcbz(js.getStr("YCTS"));
+ LtkjHybgd bgd = new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(js.getStr("JCZBDM"));
+ bgd.setJcxm(js.getStr("JCZBMC"));
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCZBJG"));
+ bgd.setJgdw(js.getStr("JLDW"));
+ bgd.setFwzdz(js.getStr(""));
+ bgd.setFwzgz(js.getStr(""));
+ bgd.setFwz(js.getStr("CKZFW"));
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(js.getStr("JCRBH"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(js.getStr("SHRBH"));
+ bgd.setShysmc(js.getStr("SHRXM"));
+ bgd.setYcbz(js.getStr("YCTS"));
// bgd.setTpurl(js.getStr(""));
- ltkjHybgdService.save(bgd);
+ ltkjHybgdService.save(bgd);
+ }
}
- }
- Map<String, Object> fbhashMap = new HashMap<>();
- fbhashMap.put("jybgid", hysqd.getTmh());
- AjaxResult fbres = controller.Getlabgermrepinfo(fbhashMap);
- String ajaxResult = getAjaxResult(fbres);
- JSONObject fbobject = getJSONObject(ajaxResult);
- String fbcode = fbobject.getStr("ResultCode");
- if (null != fbcode && fbcode.equals("0")) {
- JSONArray datas = fbobject.getJSONArray("ResultData");
- for (Object o : datas) {
- JSONObject js = (JSONObject) o;
- LtkjHybgd bgd = new LtkjHybgd();
- bgd.setTmh(hysqd.getTmh());
- bgd.setJcxmid(hysqd.getXmid());
- bgd.setJcxm(hysqd.getXmmc());
- bgd.setTdh(js.getStr(""));
- bgd.setJyjg(js.getStr("JCJG"));
- bgd.setJgdw("/");
- bgd.setFwzdz("/");
- bgd.setFwzgz("/");
- bgd.setFwz("/");
- bgd.setJysj(js.getStr("BGRQ"));
- bgd.setJyys(hysqd.getSqrxm());
- bgd.setShsj(js.getStr("BGRQ"));
- bgd.setShys(hysqd.getShrdm());
- bgd.setShysmc(hysqd.getShrxm());
- ltkjHybgdService.save(bgd);
+ Map<String, Object> fbhashMap = new HashMap<>();
+ fbhashMap.put("jybgid", hysqd.getTmh());
+ AjaxResult fbres = controller.Getlabgermrepinfo(fbhashMap);
+ String ajaxResult = getAjaxResult(fbres);
+ JSONObject fbobject = getJSONObject(ajaxResult);
+ String fbcode = fbobject.getStr("ResultCode");
+ if (null != fbcode && fbcode.equals("0")) {
+ JSONArray datas = fbobject.getJSONArray("ResultData");
+ for (Object o : datas) {
+ JSONObject js = (JSONObject) o;
+ LtkjHybgd bgd = new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(hysqd.getXmid());
+ bgd.setJcxm(hysqd.getXmmc());
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCJG"));
+ bgd.setJgdw("/");
+ bgd.setFwzdz("/");
+ bgd.setFwzgz("/");
+ bgd.setFwz("/");
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(hysqd.getSqrxm());
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(hysqd.getShrdm());
+ bgd.setShysmc(hysqd.getShrxm());
+ ltkjHybgdService.save(bgd);
+ }
}
+ }else {
+ saveHybgdPro(hysqd);
}
-
}
}
//鍚屾鍖栭獙椤圭洰
@@ -754,15 +770,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);
+ }
+ log.info("妫�楠岄」鐩煡璇㈣繑鍥炲��: " + JSONUtil.toJsonStr(result));
+
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
@@ -778,28 +802,36 @@
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);
if (list.isEmpty())
isInsertHysqd = true;
- if (isInsertHysqd) {
- saveHysqd(hysqd);
- } else {
- saveHybgd(hysqd);
+ if(StrUtil.isBlank(jytbfs) || jytbfs.equalsIgnoreCase("Y")){
+ if (isInsertHysqd) {
+ saveHysqd(hysqd);
+ } else {
+ saveHybgd(hysqd);
+ }
+ }else {
+ if (isInsertHysqd) {
+ saveHysqdPro(hysqd);
+ } else {
+ saveHybgdPro(hysqd);
+ }
}
}
} else {
@@ -821,13 +853,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()) {
@@ -871,30 +903,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妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!";
@@ -922,6 +955,12 @@
private void saveHysqd(LtkjHysqd hysqd) {
if (ltkjHysqdService.save(hysqd)) {
saveHybgd(hysqd);
+ }
+ }
+
+ private void saveHysqdPro(LtkjHysqd hysqd) {
+ if (ltkjHysqdService.save(hysqd)) {
+ saveHybgdPro(hysqd);
}
}
@@ -996,6 +1035,60 @@
}
}
+ private void saveHybgdPro(LtkjHysqd hysqd) {
+ List<Map<String, Object>> mapList = ltkjHysqdService.getAsyncJybgdByPro(hysqd.getTmh());
+ log.info("usp_his_getlabdetailinfolttj 杩斿洖->\n{}",JSONUtil.toJsonStr(mapList));
+ for (Map<String, Object> map : mapList) {
+ JSONObject js = JSONUtil.parseObj(map);
+ LtkjHybgd bgd = new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(js.getStr("JCZBDM"));
+ bgd.setJcxm(js.getStr("JCZBMC"));
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCZBJG"));
+ bgd.setJgdw(js.getStr("JLDW"));
+ bgd.setFwzdz(js.getStr(""));
+ bgd.setFwzgz(js.getStr(""));
+ bgd.setFwz(js.getStr("CKZFW"));
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(js.getStr("JCRBH"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(js.getStr("SHRBH"));
+ bgd.setShysmc(js.getStr("SHRXM"));
+ bgd.setYcbz(js.getStr("YCTS"));
+ bgd.setCreateTime(new Date());
+ QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
+ List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
+ if (list.isEmpty())
+ ltkjHybgdService.save(bgd);
+ }
+ List<Map<String, Object>> mapList1 = ltkjHysqdService.getAsyncJybgdWswByPro(hysqd.getTmh());
+ log.info("usp_his_getlabgermrepinfolttj 杩斿洖->\n{}",JSONUtil.toJsonStr(mapList1));
+ for (Map<String, Object> map : mapList1) {
+ JSONObject js = JSONUtil.parseObj(map);
+ LtkjHybgd bgd = new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(hysqd.getXmid());
+ bgd.setJcxm(hysqd.getXmmc());
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCJG"));
+ bgd.setJgdw("/");
+ bgd.setFwzdz("/");
+ bgd.setFwzgz("/");
+ bgd.setFwz("/");
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(hysqd.getSqrxm());
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(hysqd.getShrdm());
+ bgd.setShysmc(hysqd.getShrxm());
+ QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
+ List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
+ if (list.isEmpty())
+ ltkjHybgdService.save(bgd);
+ }
+ }
+
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
String Response = JSONUtil.parseObj(builder).getStr("Response");
@@ -1043,96 +1136,9 @@
@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 tjCategory) {
- // String config = configService.selectConfigByKey("tj_confirm");
-// DateTime beginTimes = null;
-// DateTime endTimes = null;
-// if (null != beginTime && null != endTime) {
-// beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
-// endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
-// }
-// asyncService.checkSetCustomerLisByRedis(config);
-// //鍒濆鍖栦綋妫�璁㈠崟琛�
-// List<TjOrder> orderList = null;
-// List<TjCustomer> customerList = new ArrayList<>();
-// Map<String, Object> map = new HashMap<>();
-//
-// //濮撳悕鏌ヨ
-// if (null != name && !"".equals(name)) {
-// List<TjCustomer> list = customerService.getTjCustomerList(name);
-// if (null != list && list.size() > 0) {
-// List<TjCustomer> lists = new ArrayList<>();
-// for (TjCustomer customer : list) {
-// if ("Y".equals(config)) {
-// orderList = orderService.getCsTjOrderListByCusId1(customer.getCusId());
-// } else {
-// orderList = orderService.getTjOrderListByCusId(customer.getCusId());
-// }
-// if (null != orderList && orderList.size() > 0) {
-// for (TjOrder tjOrder : orderList) {
-// customer.setTjNumber(tjOrder.getTjNumber());
-// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
-// customer.setOrderId(tjOrder.getOrderId());
-// customer.setTjTime(tjOrder.getFinishTime());
-// customer.setFinishTime(tjOrder.getFinishTime());
-// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
-// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
-// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
-// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
-// customer.setTjCategory(tjOrder.getTjCategory());
-// if (tjOrder.getFirmId().equals("0")) {
-// customer.setTjCompName(null);
-// } else {
-// customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
-// }
-// lists.add(customer);
-// }
-// }
-// }
-// List<TjCustomer> customers = null;
-// if (lists.size() > 0) {
-// customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// }
-// map.put("customers", customers);
-// map.put("total", lists.size());
-// return AjaxResult.success(map);
-// }
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-//
-// //鏉′欢鏌ヨ
-// if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
-// //鍒ゆ柇鏄惁寮�鍚垵瀹�
-// if ("Y".equals(config)) {
-// orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
-// } else {
-// orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
-// }
-// return getResult(page, pageSize, orderList, customerList, map);
-// }
-//
-// List<TjCustomer> customers = null;
-// if (null != checkStatus && checkStatus == 0) {
-// customers = redisCache.getCacheMapValue("check", "ws");
-// }
-// if (null != checkStatus && checkStatus == 1) {
-// customers = redisCache.getCacheMapValue("check", "ys");
-// }
-// if (customers != null && customers.size() > 0) {
-//// asyncService.addRedis(customers);
-// List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// map.put("customers", customerLists);
-// map.put("total", customers.size());
-// return AjaxResult.success(map);
-// } else {
-// //鍒ゆ柇鏄惁寮�鍚垵瀹�
-// if ("Y".equals(config)) {
-// orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
-// } else {
-// orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
-// }
-// return getResult(page, pageSize, orderList, customerList, map);
-// }
+ @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tjCategory,
+ @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tcm) {
+
String value = String.valueOf(compId);
if (tjNumber == null) tjNumber = "";
@@ -1140,7 +1146,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,tjCategory));
+ return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name,tjCategory,tcm));
}
@@ -1154,95 +1160,6 @@
@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;
-// if (null != beginTime && null != endTime) {
-// beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
-// endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
-// }
-// asyncService.checkSetCustomerLisByRedis(config);
-// //鍒濆鍖栦綋妫�璁㈠崟琛�
-// List<TjOrder> orderList = null;
-// List<TjCustomer> customerList = new ArrayList<>();
-// Map<String, Object> map = new HashMap<>();
-//
-// //濮撳悕鏌ヨ
-// if (null != name && !"".equals(name)) {
-// List<TjCustomer> list = customerService.getTjCustomerList(name);
-// if (null != list && list.size() > 0) {
-// List<TjCustomer> lists = new ArrayList<>();
-// for (TjCustomer customer : list) {
-// if ("Y".equals(config)) {
-// orderList = orderService.getCsTjOrderListByCusId1(customer.getCusId());
-// } else {
-// orderList = orderService.getTjOrderListByCusId(customer.getCusId());
-// }
-// if (null != orderList && orderList.size() > 0) {
-// for (TjOrder tjOrder : orderList) {
-// customer.setTjNumber(tjOrder.getTjNumber());
-// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
-// customer.setOrderId(tjOrder.getOrderId());
-// customer.setTjTime(tjOrder.getFinishTime());
-// customer.setFinishTime(tjOrder.getFinishTime());
-// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
-// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
-// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
-// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
-// customer.setTjCategory(tjOrder.getTjCategory());
-// if (tjOrder.getFirmId().equals("0")) {
-// customer.setTjCompName(null);
-// } else {
-// customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
-// }
-// lists.add(customer);
-// }
-// }
-// }
-// List<TjCustomer> customers = null;
-// if (lists.size() > 0) {
-// customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// }
-// map.put("customers", customers);
-// map.put("total", lists.size());
-// return AjaxResult.success(map);
-// }
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-//
-// //鏉′欢鏌ヨ
-// if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
-// //鍒ゆ柇鏄惁寮�鍚垵瀹�
-// if ("Y".equals(config)) {
-// orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
-// } else {
-// orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
-// }
-// return getResult(page, pageSize, orderList, customerList, map);
-// }
-//
-// List<TjCustomer> customers = null;
-// if (null != checkStatus && checkStatus == 0) {
-// customers = redisCache.getCacheMapValue("check", "ws");
-// }
-// if (null != checkStatus && checkStatus == 1) {
-// customers = redisCache.getCacheMapValue("check", "ys");
-// }
-// if (customers != null && customers.size() > 0) {
-//// asyncService.addRedis(customers);
-// List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// map.put("customers", customerLists);
-// map.put("total", customers.size());
-// return AjaxResult.success(map);
-// } else {
-// //鍒ゆ柇鏄惁寮�鍚垵瀹�
-// if ("Y".equals(config)) {
-// orderList = orderService.getCsTjOrderList1(tjNumber, checkStatus, compId, beginTimes, endTimes);
-// } else {
-// orderList = orderService.getTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
-// }
-// return getResult(page, pageSize, orderList, customerList, map);
-// }
String value = String.valueOf(compId);
if (tjNumber == null) tjNumber = "";
@@ -1257,61 +1174,53 @@
/**
* 鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅鎺ュ彛
*
- * @param tjNumber
- * @param advice
- * @param checkStatus
* @return
*/
- @PutMapping("/getTjdetailList")
+ @PostMapping("/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,
- @ApiParam(value = "鑱屼笟缁撹") @RequestParam(required = false) String zhiyeJl,
- @ApiParam(value = "鑱屼笟缁撴灉") @RequestParam(required = false) String zhiyeJg) {
+ @Transactional
+ public AjaxResult getTjdetailList(@RequestBody CheckUpdateStatusDto dto) {
- String config = configService.selectConfigByKey("sfjcwjhyqxm");
- if (null != config && config.equalsIgnoreCase("Y")) {
- 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);
- LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder tjOrder = orderService.getOne(wq1);
- if (null != tjOrder) {
- tjOrder.setCheckAdvice(advice);
- tjOrder.setCheckStatus(checkStatus);
- tjOrder.setStatus(TjConstants.TJ_CHECK);
- tjOrder.setCheckDoctor(sysUser.getNickName());
- 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) {
- customer.setCusNumber(customer.getCusNumber() + 1);
- customer.setCardId("0");
- if (customerService.updateById(customer)) {
- asyncService.updateCheckType(tjNumber);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
- }
- return AjaxResult.error("鎿嶄綔澶辫触");
- }
- }
- return AjaxResult.error("鎿嶄綔澶辫触");
+ try {
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if (null != config && config.equalsIgnoreCase("Y")) {
+ int num = orderRemarkService.getTjYqOrderRemarkByTjNum(dto.getTjNumber());
+ if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
- return AjaxResult.success("鏁版嵁涓嶅瓨鍦�");
+ Date date = new Date();
+ if (null != dto.getTjNumber()) {
+ Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
+ SysUser sysUser = userService.getById(userId);
+ TjOrder tjOrder = orderService.getOrderByTjNum(dto.getTjNumber());
+ if (null != tjOrder) {
+ tjOrder.setCheckAdvice(dto.getAdvice());
+ tjOrder.setCheckStatus(dto.getCheckStatus());
+ tjOrder.setStatus(TjConstants.TJ_CHECK);
+ tjOrder.setCheckDoctor(sysUser.getNickName());
+ tjOrder.setCheckTime(date);
+ tjOrder.setStatus(401);
+ tjOrder.setFinishTime(date);
+ if (StrUtil.isNotBlank(dto.getZhiyeJl()))
+ tjOrder.setZhiyeJl(dto.getZhiyeJl());
+ if (StrUtil.isNotBlank(dto.getZhiyeJg()))
+ tjOrder.setZhiyeJg(dto.getZhiyeJg());
+ if (orderService.updateById(tjOrder)) {
+ AjaxResult pdf = reportController.toPdf(dto.getTjNumber());
+ if (!pdf.get("code").toString().equals("200") ) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触!");
+ }
+ return AjaxResult.success("瀹℃牳骞剁敓鎴愭姤鍛婃垚鍔�!");
+ }
+ return AjaxResult.error("鎿嶄綔澶辫触");
+ }
+ return AjaxResult.success("鏁版嵁涓嶅瓨鍦�");
+ }
+ return AjaxResult.error();
+ } catch (Exception ex) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new RuntimeException(ex);
}
- return AjaxResult.error();
}
@@ -1548,53 +1457,81 @@
parent.put("zhiyejg", one.getZhiyeJg());
List<TjOrderDetail> dels = new ArrayList<>();
if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
- for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
- String ckfw = tjOrderDetail.getStanId();
- 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("");
+ Map<String, List<TjOrderDetail>> listMap = tjOrderDetails.stream()
+ .filter(i -> StrUtil.isNotBlank(i.getProResult()) && remark.getProsId().equals(i.getProsId()))
+ .collect(Collectors.groupingBy(TjOrderDetail::getProResult));
+ boolean isGroupOnce = false;
+ String groupOnceProResult = "";
+ if (listMap.size() == 1){
+ String firstKey = listMap.keySet().stream().findFirst().orElse(null);
+ LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SysDictData::getDictType,"qj_type");
+ wrapper.eq(SysDictData::getDictLabel,firstKey);
+ List<SysDictData> dictList = sysDictDataService.list(wrapper);
+ if (!dictList.isEmpty()) {
+ isGroupOnce = true;
+ groupOnceProResult = firstKey;
+ }
+ }
+ if (isGroupOnce){
+ TjOrderDetail tjOrderDetail = new TjOrderDetail();
+ tjOrderDetail.setProName(remark.getProName());
+ tjOrderDetail.setProResult(groupOnceProResult);
+ dels.add(tjOrderDetail);
+ }else{
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+ String ckfw = tjOrderDetail.getStanId();
+ 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 {
+ 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("");
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("");
+
+ 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("鈫�");
+ } catch (NumberFormatException ignored) {
}
- } catch (NumberFormatException ignored) {
- }
- } else {
- tjOrderDetail.setYcbz("");
- tjOrderDetail.setProResult(tjOrderDetail.getProResult());
- }
+ } else {
+// tjOrderDetail.setYcbz("");
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("");
- if (remark.getOrgType().equals(tjOrderDetail.getOrgType())) {
- dels.add(tjOrderDetail);
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("鈫�");
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult());
+ }
+
+ if (remark.getOrgType().equals(tjOrderDetail.getOrgType())) {
+ dels.add(tjOrderDetail);
+ }
}
}
}
@@ -1608,12 +1545,13 @@
if (dels.isEmpty()) {
continue;
}
- 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());
+// 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());
+ dels = dels.stream().sorted(Comparator.comparing(TjOrderDetail::getXh)).collect(Collectors.toList());
parent.put("sons", dels);
parent.put("remark", remark.getRemark());
parent.put("jgbx", remark.getJgbx());
@@ -1704,20 +1642,26 @@
try {
if (StrUtil.isNotBlank(tjNum)) {
TjOrder one = orderService.getOrderByTjNum(tjNum);
-
+ List<Map<String, Object>> maps = new ArrayList<>();
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 {
+ List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNum);
+ if(null!=tjOrderYcxmList&&!tjOrderYcxmList.isEmpty()){
+ 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 AjaxResult.success(maps);
+ }
+ }else {
return zongjianyishengchakanyichangxiangmu(tjNum);
}
+
}
return AjaxResult.error();
} catch (Exception ex) {
@@ -1880,88 +1824,94 @@
private void yichangxiangmu(String tjNumber) {
try {
- List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNumber);
- String xb= customerService.getSexByTjh(tjNumber);
- if(null !=tjOrderYcxmList && !tjOrderYcxmList.isEmpty()){
+ 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) {
+ String xb = customerService.getSexByTjh(order.getTjNumber());
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<TjOrderRemark> collects = remarkList.stream()
+ .filter(b -> tjOrderYcxmList.stream()
+ .noneMatch(a -> a.getParentName() != null && a.getParentName().equals(b.getProName()))).collect(Collectors.toList());
+ if (!collects.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")) {
+ String replacedAll = tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
- String replacedAll = tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
-
- List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
- ,replacedAll,
- tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
- , replacedAll
- , tjOrderDetail.getProResult());
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
+ , replacedAll, tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber, replacedAll, 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", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");
- Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb);
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(maps);
}
- }
- tjOrderDetail.setAdvices(mapList);
- }
+ } else {
+ String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ for (String s : split) {
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");
+ ;
+ Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0", xb);
+ 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);
}
- dels.add(tjOrderDetail);
+ }
+ if (!dels.isEmpty()) {
+ parent.put("proName", remark.getProName());
+ parent.put("jyjc", remark.getJyjc());
+ parent.put("sone", dels);
+ list.add(parent);
}
}
- 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);
+ }
}
}
}
- }
- }
- 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);
- }
}
}
}
@@ -2067,4 +2017,99 @@
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();
+ }
+
+
+
+ @GetMapping("/getRsjList")
+ @ApiOperation(value = "鎬绘妫�鏌ヤ簩涓夌骇鏌ヨ鎺ュ彛")//0寰�1宸�
+// @PreAuthorize("@ss.hasPermi('check:check:getList')")
+ public AjaxResult getRsjList(@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,
+ @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tjCategory,
+ @ApiParam(value = "浣撴绫诲瀷") @RequestParam(required = false) String tcm) {
+
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ String type = "0";
+ if (null != roles && !roles.isEmpty()) {
+ List<SysRole> erji = roles.stream().filter(item -> item.getRoleName().contains("浜岀骇瀹℃牳")).collect(Collectors.toList());
+ List<SysRole> sanji = roles.stream().filter(item -> item.getRoleName().contains("涓夌骇瀹℃牳")).collect(Collectors.toList());
+ if (!erji.isEmpty()) type="2";
+ if (!sanji.isEmpty()) type="3";
+ }
+
+ String value = String.valueOf(compId);
+ if (tjNumber == null) tjNumber = "";
+ if (compId == null) value = "";
+ if (name == null) name = "";
+ if (beginTime == null) beginTime = "";
+ if (endTime == null) endTime = "";
+ return AjaxResult.success(orderService.getEsjCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value,
+ beginTime, endTime, name,tjCategory,tcm,type));
+ }
+
}
--
Gitblit v1.8.0