From 37e2d3c73caac445d1d8e229747b439e3719c13b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 03 六月 2025 17:04:13 +0800
Subject: [PATCH] zjh20250603
---
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 12 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 37 ++++++++++++++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java | 4 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 10 +++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 3 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java | 5 ++
ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java | 2 +
10 files changed, 71 insertions(+), 8 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
index 56a0346..bbfe4cb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -7,20 +7,23 @@
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.mapper.TjCustomerMapper;
+import com.ltkj.hosp.service.ITjOrderDetailService;
import com.ltkj.hosp.service.ITjOrderService;
+import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import com.ltkj.web.controller.system.TjCheckController;
import com.ltkj.web.controller.system.TjReportController;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+
+import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -39,6 +42,8 @@
private TjCustomerMapper tjCustomerMapper;
@Autowired
private ITjOrderService tjOrderService;
+ @Autowired
+ private ITjOrderDetailService detailService;
/**
* 鎻愪緵缁欎笁鏂硅皟鐢ㄧ殑鎶ュ憡鏌ョ湅鎺ュ彛
@@ -145,4 +150,28 @@
}
}
+
+
+ /**
+ * 灏忕▼搴忕偣鍑讳綋妫�鎶ュ憡鏌ヨ璇︽儏,鏄剧ず韬珮浣撻噸浣撻噸鎸囨暟鏀剁缉鍘嬭垝寮犲帇
+ */
+ @GetMapping("/getShenGaoTiZhong")
+ @ApiOperation(value = "灏忕▼搴�-浣撴鎶ュ憡鏌ヨ璇︽儏")
+ public AjaxResult getShenGaoTiZhong(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
+// Map<String, Object> objectMap = new HashMap<>();
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrder::getTjNumber, tjNumber);
+ wq1.eq(TjOrder::getCheckStatus, 1);
+ TjOrder one = tjOrderService.getOne(wq1);
+ if (one == null) {
+ return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒");
+ }
+
+ List<ShenGaoTiZhongVo> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
+
+ log.info("ltkj {}鐨勪綋妫�鎶ュ憡鏌ヨ璇︽儏"+maps,tjNumber);
+ return AjaxResult.success(maps);
+
+ }
+
}
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 e826098..0d247f0 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
@@ -2072,4 +2072,14 @@
return detailService.updFcPro(json);
}
+
+
+ @GetMapping("/zongjianyishengHuiFuyichangxiangmu")
+ @ApiOperation(value = "鎬绘鎭㈠寮傚父椤圭洰鎺ュ彛")
+ public AjaxResult zongjianyishengHuiFuyichangxiangmu(@RequestParam String tjNum) {
+
+ List<TjOrderYcxm> list = ycxmService.zongjianyishengHuiFuyichangxiangmu(tjNum);
+ return AjaxResult.success(list);
+ }
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 6da640c..756d268 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -41,6 +41,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -178,7 +179,7 @@
@ApiOperation(value = "鏌ヨ浣撴棰勭害鍒楄〃鎺ュ彛(榛樿)")
public TableDataInfo list(TjReservation tjReservation) {
startPage();
- tjReservation.setIsExpire(2);
+ if(tjReservation.getIsExpire()==null) tjReservation.setIsExpire(2);
List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
// if(null !=list && list.size()>0){
// for (TjReservation reservation : 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 db2f32c..af53c70 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
@@ -439,7 +439,7 @@
jcycxmService.remove(wq);
if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){
String s = "銆倈锛泑;|,|锛�";
- String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split(s);
+ String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "銆�").split(s);
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
index 74c171c..31bca15 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -117,7 +117,7 @@
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
- .antMatchers("/api/viewReport","/api/reportData","/api/getInfo").permitAll()
+ .antMatchers("/api/**").permitAll()
.antMatchers("/jmreport/**","/lis/**","/pacs/**","/callBack/**","/hosp/order/signOrderInfo").anonymous()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
.anyRequest().authenticated()
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
index 6b98f0b..2aace84 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
@@ -333,6 +333,18 @@
@TableField(exist = false)
private Integer tjStatus;
+
+ @ApiModelProperty("棰勭害鏃堕棿寮�濮�")
+ @TableField(exist = false)
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private Date yykssj;
+
+
+ @ApiModelProperty("棰勭害鏃堕棿缁撴潫")
+ @TableField(exist = false)
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private Date yyjssj;
+
@ApiModelProperty("搴ф満")
private String dwPhone;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
index b822adb..baafa90 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderYcxmMapper.java
@@ -24,4 +24,8 @@
@Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNumber}")
List<TjOrderYcxm> selectListByTjh(String tjNumber);
+
+
+ @Select("select * FROM tj_order_ycxm WHERE tjh=#{tjNum} and deleted=1")
+ List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
index 0b89b95..fd64221 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjOrderYcxmService.java
@@ -17,4 +17,6 @@
void delOrderYcXmJyByTjh(String tjh);
List<TjOrderYcxm> selectListByTjh(String tjNumber);
+
+ List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
index 2f96343..39bd671 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderYcxmServiceImpl.java
@@ -31,4 +31,9 @@
public List<TjOrderYcxm> selectListByTjh(String tjNumber) {
return mapper.selectListByTjh(tjNumber);
}
+
+ @Override
+ public List<TjOrderYcxm> zongjianyishengHuiFuyichangxiangmu(String tjNum) {
+ return mapper.zongjianyishengHuiFuyichangxiangmu(tjNum);
+ }
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
index 62d6251..22f0fa6 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -85,7 +85,7 @@
<if test="phoe != null and phoe != ''">and phoe = #{phoe}</if>
<if test="company != null and company != ''">and company like concat('%', #{company}, '%')</if>
<if test="companyId != null and companyId != ''">and company_id = #{companyId} </if>
- <if test="reservationTime != null ">and reservation_time BETWEEN #{reservationTime} and now()</if>
+ <if test="yykssj != null and yyjssj != null ">and reservation_time BETWEEN #{yykssj} and #{yyjssj} </if>
<if test="isExpire != null ">and is_expire = #{isExpire}</if>
and deleted = '0'
</where>
--
Gitblit v1.8.0