From 22efacd7994f8ea9a7ef8485575ade9729a0e5a2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 22 四月 2025 17:53:25 +0800
Subject: [PATCH] zjh20250422
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 4 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 31 +++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 35 +++++------------
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java | 3 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java | 4 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 16 ++++---
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java | 3 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 14 +++---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java | 2
12 files changed, 70 insertions(+), 48 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index 93246b8..b3130af 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -148,7 +148,7 @@
if(null !=list && !list.isEmpty()){
for (LtkjExamJcsqd jcsqd : list) {
if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
index ae166e1..555bbb2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
@@ -22,6 +22,7 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -167,7 +168,7 @@
}
private int getAllTotal(TjOrder tjOrder, TjCustomer tjCustomer, JSONArray array, ArrayList<SavePacsApply> successPacsList, ArrayList<SavePacsApply> errorPacsList, TjProject project, String dept, String ysbm, String ysmc, int allTotal) {
- if (null != project.getHisXmbm()) {
+ if (StringUtil.isNotBlank(project.getHisXmbm())) {
SavePacsApply savePacsApply = new SavePacsApply();
savePacsApply.setExamNo(tjOrder.getCardId());
savePacsApply.setName(tjCustomer.getCusName());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 6ca25c6..d888fc2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -629,7 +629,7 @@
List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
,"","",order.getTjNumber()
,detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇","")
+ .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("鈼�","")
,detail.getProResult());
String[] split = detail.getProResult().split("銆倈,|锛�");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index f4b339a..8576fcb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -285,7 +285,7 @@
if(!jcsqdList.isEmpty()){
for (LtkjExamJcsqd jcsqd : jcsqdList) {
if(StringUtil.isNotBlank(jcsqd.getJgzt())){
- String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
@@ -323,7 +323,7 @@
public AjaxResult zx(@RequestParam int day) {
try {
List<DictHosp> list = dictHospService.list();
- DateTime dateTime1 = DateUtil.offsetMonth(new Date(), day);
+ DateTime dateTime1 = DateUtil.offsetDay(new Date(), day);
for (DictHosp dictHosp : list) {
String mallMerchantSecretKey = SecurityUtils.getMallMerchantSecretKey(secret, dictHosp.getHospAreaId(), dictHosp.getHospAreaName(), dateTime1);
dictHosp.setSecretKey(mallMerchantSecretKey);
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 ee54d64..3d9ab8a 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
@@ -1785,10 +1785,11 @@
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("[锛�(][^锛�)]*[锛�)]", "").replaceAll("鈼�","")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""),
+ tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
, tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�","")
, tjOrderDetail.getProResult());
@@ -1797,7 +1798,7 @@
}
} else {
- String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
+ String[] split = tjOrderDetail.getProResult().split("銆倈锛泑;|,|锛�");
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
s = s.replaceAll("\n", "");
@@ -1874,10 +1875,11 @@
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("[锛�(][^锛�)]*[锛�)]", "").replaceAll("鈼�","")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""),
+ tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
, tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�","")
, tjOrderDetail.getProResult());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 401de6d..8b39ed1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -844,17 +844,7 @@
}
- /**
- * 瀵煎嚭浣撴璁板綍鍒楄〃
- */
- @Log(title = "浣撴璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ApiOperation(value = "瀵煎嚭浣撴璁板綍鍒楄〃")
- public void export(HttpServletResponse response, TjOrder tjOrder) {
- List<TjOrder> list = tjOrderService.selectExportOrderList(tjOrder);
- ExcelUtil<TjOrder> util = new ExcelUtil<TjOrder>(TjOrder.class);
- util.exportExcel(response, list, "浣撴璁板綍鏁版嵁");
- }
+
@PostMapping("/exportOrderList")
@ApiOperation(value = "瀵煎嚭浣撴璁板綍鍒楄〃")
@@ -869,6 +859,7 @@
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
@ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime,
@ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw,
+ @ApiParam(value = "褰撳墠椤垫垨鍏ㄩ儴鏁版嵁") @RequestParam(required = false) String dqyorqbsj,
HttpServletResponse response) {
List<Long> cusIds = null;
if (null != name) {
@@ -992,9 +983,15 @@
}
wq.orderByDesc(TjOrder::getCreateTime);
- Page<TjOrder> page2 = tjOrderService.page(page1, wq);
- List<TjOrder> list = page2.getRecords();
- if (list != null) {
+
+ List<TjOrder> list =null;
+ if(StringUtil.isNotBlank(dqyorqbsj) && dqyorqbsj.equals("1")){
+ list = tjOrderService.list(wq);
+ }else {
+ Page<TjOrder> page2 = tjOrderService.page(page1, wq);
+ list = page2.getRecords();
+ }
+ if (!list.isEmpty()) {
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
@@ -4093,16 +4090,6 @@
@GetMapping(value = "newgetTransitionList")
@ApiOperation(value = "鏈�鏂版煡璇㈣繃娓¤〃鏁版嵁")
public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
-// String pacId = transitionService.getTbTransitionPacId(cusId);
-// if(StringUtil.isNotBlank(pacId)){
-// //琛ュ樊浠�
-// List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId, cusId);
-// if(null !=cjMaps && !cjMaps.isEmpty()){
-// for (Map<String, Object> cjMap : cjMaps) {
-// transitionService.buxiangmuchajia(cusId,pacId,cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
-// }
-// }
-// }
List<TbTransition> list = transitionService.newgetTransitionList(cusId);
return AjaxResult.success(list);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index 49d19ca..4687148 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -16,6 +16,7 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
@@ -68,6 +69,8 @@
private LtkjExamJcbgdService jcbgdService;
@Resource
private LtkjExamJcsqdService jcsqdService;
+ @Autowired
+ private TjJcycxmService jcycxmService;
/**
* 鏌ヨ浣撴蹇冪數鍥剧鐞嗗垪琛�
*/
@@ -366,6 +369,7 @@
}
return AjaxResult.error("鏆傛棤浣撴璁板綍");
} catch (Exception e) {
+ e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error("鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�"+e.getMessage());
throw new RuntimeException("鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�");
@@ -397,9 +401,34 @@
jcbgd.setLx("1");
jcbgd.setCreateTime(date);
jcbgdService.save(jcbgd);
- jcsqdService.deletedLtkjJcsqdByTjhandtmh(xdtgmdjg.getCardId());
+ jcsqdService.deletedLtkjJcsqdByTjhandtmh1(xdtgmdjg.getCardId());
jcsqdService.saveLtkjExamJcsqdxdt(xdtgmdjg.getCardId());
+
+ LambdaQueryWrapper<TjJcycxm> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjJcycxm::getTjh,xdtgmdjg.getTjh());
+ wq.eq(TjJcycxm::getProId,xdtgmdjg.getProId());
+ jcycxmService.remove(wq);
+ if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){
+ String[] split = xdtgmdjg.getJcjl().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(xdtgmdjg.getTjh());
+ jcycxm.setYqid("");
+ jcycxm.setProId(xdtgmdjg.getProId());
+ jcycxm.setProName(xdtgmdjg.getProName());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
+ }
+ }
+
+
} catch (Exception e) {
+ e.printStackTrace();
throw new RuntimeException(e);
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
index 6c61a2f..6df359c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
@@ -120,7 +120,7 @@
private String firmId;
@ApiModelProperty(value = "鍗曚綅鍚嶇О")
- @Excel(name = "鍗曚綅鍚�")
+ @Excel(name = "鍗曚綅")
private String firmName;
@@ -128,8 +128,8 @@
/**
* 閮ㄩ棬鍚�
*/
- @Excel(name = "閮ㄩ棬鍚�", defaultValue = "鏃�")
- @ApiModelProperty(value = "閮ㄩ棬鍚�")
+ @Excel(name = "閮ㄩ棬", defaultValue = "鏃�")
+ @ApiModelProperty(value = "閮ㄩ棬")
private String firmDeptName;
/**
@@ -207,7 +207,7 @@
* 鎶ュ憡鏈�鍚庢墦鍗版椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = " 鎵撳嵃鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏃�")
+ @Excel(name = " 鎵撳嵃鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏃�")
@ApiModelProperty(value = "鎶ュ憡鏈�鍚庢墦鍗版椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date printLastTime;
@@ -275,7 +275,7 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛韬唤璇佸彿鐮�")
- @Excel(name = "韬唤璇佸彿鐮�")
+ @Excel(name = "璇佷欢鍙�")
private String tjCusIdCard;
@@ -379,7 +379,7 @@
/**
* 浣撴鐘舵��
*/
- @Excel(name = "浣撴鐘舵��", defaultValue = "鏃�")
+// @Excel(name = "浣撴鐘舵��", defaultValue = "鏃�")
@ApiModelProperty(value = "浣撴鐘舵��")
private Integer status;
/**
@@ -445,7 +445,7 @@
* 浣撴绫诲埆
*/
@ApiModelProperty("浣撴绫诲埆")
- @Excel(name = "浣撴绫诲埆")
+// @Excel(name = "浣撴绫诲埆")
private String tjCategory;
@ApiModelProperty("灏辫瘖缂栧彿")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
index 65a5a9c..d5f9e98 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
@@ -268,6 +268,9 @@
@ApiModelProperty(value = "搴忓彿")
private Integer xh;
+ @ApiModelProperty(value = "鏄惁鍙備笌寮傚父")
+ private Integer sfcyyc;
+
/**
* 瀛愰」鐩�
*/
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index 8cb477f..dcaf2b1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -32,7 +32,7 @@
void deletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
@Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and lx=1 ")
- void deletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh);
+ void deletedLtkjJcsqdByTjhandtmh1(@Param("tjh") String tjh);
@Select("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh}")
List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
index b32502b..2e1e879 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
@@ -25,7 +25,7 @@
void deletedLtkjJcsqdByTjhandtmh(String tjh,String tmh);
- void deletedLtkjJcsqdByTjhandtmh(String tjh);
+ void deletedLtkjJcsqdByTjhandtmh1(String tjh);
List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
index 890fa43..06fbdcf 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
@@ -62,8 +62,8 @@
}
@Override
- public void deletedLtkjJcsqdByTjhandtmh(String tjh) {
- mapper.deletedLtkjJcsqdByTjhandtmh(tjh);
+ public void deletedLtkjJcsqdByTjhandtmh1(String tjh) {
+ mapper.deletedLtkjJcsqdByTjhandtmh1(tjh);
}
@Override
--
Gitblit v1.8.0