From a0dde8aa21d8bc2b55ccbb2278fc730f75f7ef8b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 七月 2025 08:55:13 +0800
Subject: [PATCH] zjh20250718
---
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 43 ++++++++++++++-------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 18 ++++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 33 ++++++----------
ltkj-hosp/src/main/java/com/ltkj/hosp/dto/CheckUpdateStatusDto.java | 21 ++++++++++
5 files changed, 76 insertions(+), 41 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 785af32..6018389 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
@@ -8,10 +8,12 @@
import com.itextpdf.text.Element;
import com.itextpdf.text.Paragraph;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjOrderYcxm;
import com.ltkj.hosp.mapper.TjCustomerMapper;
+import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.hosp.service.ITjOrderDetailService;
import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.hosp.service.TjOrderYcxmService;
@@ -25,6 +27,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
@@ -50,6 +53,8 @@
private TjCheckController tjCheckController;
@Autowired
private TjCustomerMapper tjCustomerMapper;
+ @Resource
+ private ITjCustomerService customerService;
@Autowired
private ITjOrderService tjOrderService;
@Autowired
@@ -300,22 +305,30 @@
/**
* 灏忕▼搴忕偣鍑讳綋妫�鎶ュ憡鏌ヨ璇︽儏,鏄剧ず韬珮浣撻噸浣撻噸鎸囨暟鏀剁缉鍘嬭垝寮犲帇
*/
- @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("浣撴鏆傛湭瀹屾垚锛侊紒");
+ @GetMapping("/updatePhone")
+ @ApiOperation(value = "灏忕▼搴�-淇敼鎵嬫満鍙锋帴鍙�")
+ public AjaxResult updatePhone(@RequestParam @ApiParam(value = "韬唤璇佸彿") String sfzh,
+ @RequestParam @ApiParam(value = "濮撳悕") String name,
+ @RequestParam @ApiParam(value = "鎵嬫満鍙�") String phone) {
+ if(StrUtil.isBlank(sfzh) || StrUtil.isBlank(name) || StrUtil.isBlank(phone)){
+ return AjaxResult.error("璇疯緭鍏ユ纭殑淇℃伅!");
}
-
- List<ShenGaoTiZhongVo> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
-
- log.info("ltkj {}鐨勪綋妫�鎶ュ憡鏌ヨ璇︽儏"+maps,tjNumber);
- return AjaxResult.success(maps);
+ if(!MatchUtils.isIdCard(sfzh)){
+ return AjaxResult.error("韬唤璇佸彿鏍煎紡閿欒 璇锋牳瀵瑰悗閲嶆柊杈撳叆!");
+ }
+ LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjCustomer::getCusIdcard, sfzh);
+ wq.like(TjCustomer::getCusName, name);
+ TjCustomer customer = customerService.getOne(wq);
+ if(null != customer){
+ if(!MatchUtils.isMobileNO( phone)){
+ return AjaxResult.error("鎵嬫満鍙蜂笉姝ｇ‘ 璇锋牳瀵瑰悗閲嶆柊杈撳叆!");
+ }
+ customer.setCusPhone( phone);
+ customerService.updateById(customer);
+ return AjaxResult.success("淇敼鎴愬姛!");
+ }
+ return AjaxResult.error("鏈煡璇㈠埌璇ヤ汉鍛�!");
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 5bc1fde..b012cd3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -870,7 +870,7 @@
return AjaxResult.success();
}*/
- public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
+ public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
try {
String s1 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_info");
String s2 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_title");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
index 41d5d81..7ca2360 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -116,7 +116,7 @@
@GetMapping("/getKjTjAdviceKjbqBySex")
@ApiOperation(value = "鏍规嵁浣撴浜烘�у埆鍜屾槸鍚︿负鎬绘鏌ヨ浣撴寤鸿鎺ュ彛")
- public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam String sex, @RequestParam @ApiParam(value = "1甯歌鍖荤敓 0鎬绘") String isZj,
+ public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam @ApiParam(value = "1甯歌鍖荤敓 0鎬绘") String isZj,
@RequestParam(required = false) @ApiParam(value ="寤鸿鍐呭") String jynr,
@RequestParam(required = false) @ApiParam(value ="寤鸿鏍囬") String jybt,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@@ -157,11 +157,13 @@
@GetMapping("/getCyTjAdviceKjbqBySex")
@ApiOperation(value = "鏍规嵁褰撳墠鐧诲綍浜篿d鑾峰彇甯哥敤寤鸿")
- public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam(required = false) String sex, @RequestParam @ApiParam(value = "鐢ㄦ埛id 浼犲綋鍓嶇櫥褰曚汉") Long userId,
+ public AjaxResult getCyTjAdviceKjbqBySex( @RequestParam @ApiParam(value = "鐢ㄦ埛id 浼犲綋鍓嶇櫥褰曚汉") Long userId,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @RequestParam(required = false) String nr) {
LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>();
- if(!SecurityUtils.isAdmin(userId)) wq0.eq(TjUserAdvice::getUserId, userId);
+ if(!SecurityUtils.isAdmin(userId))
+ wq0.eq(TjUserAdvice::getUserId, userId);
List<TjUserAdvice> list = userAdviceService.list(wq0);
List<TjAdvice> kjbqPage = new ArrayList<>();
Map<String,Object> map = new HashMap<>();
@@ -173,7 +175,13 @@
kjbqPage.add(advice1);
}
}
- List<TjAdvice> adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ List<TjAdvice> adviceList =null;
+ if(StringUtil.isNotBlank( nr)){
+ adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr))
+ .skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ }else {
+ adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ }
map.put("total", kjbqPage.size());
map.put("records", adviceList);
return AjaxResult.success(map);
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 ab1f44c..02584c1 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
@@ -24,6 +24,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.*;
@@ -1346,46 +1347,38 @@
/**
* 鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅鎺ュ彛
*
- * @param tjNumber
- * @param advice
- * @param checkStatus
* @return
*/
- @PutMapping("/getTjdetailList")
+ @PostMapping("/getTjdetailList")
@ApiOperation(value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
-// @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
@Transactional
- 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) {
+ public AjaxResult getTjdetailList(@RequestBody CheckUpdateStatusDto dto) {
try {
String config = configService.selectConfigByKey("sfjcwjhyqxm");
if (null != config && config.equalsIgnoreCase("Y")) {
- int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ int num = orderRemarkService.getTjYqOrderRemarkByTjNum(dto.getTjNumber());
if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
Date date = new Date();
- if (null != tjNumber) {
+ if (null != dto.getTjNumber()) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
- TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ TjOrder tjOrder = orderService.getOrderByTjNum(dto.getTjNumber());
if (null != tjOrder) {
- tjOrder.setCheckAdvice(advice);
- tjOrder.setCheckStatus(checkStatus);
+ 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(zhiyeJl))
- tjOrder.setZhiyeJl(zhiyeJl);
- if (StrUtil.isNotBlank(zhiyeJg))
- tjOrder.setZhiyeJg(zhiyeJg);
+ 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(tjNumber);
+ AjaxResult pdf = reportController.toPdf(dto.getTjNumber());
if (!pdf.get("code").toString().equals("200") ) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎿嶄綔澶辫触!");
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/CheckUpdateStatusDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/CheckUpdateStatusDto.java
new file mode 100644
index 0000000..0e85c9e
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/CheckUpdateStatusDto.java
@@ -0,0 +1,21 @@
+ package com.ltkj.hosp.dto;
+
+ import io.swagger.annotations.ApiParam;
+ import lombok.Data;
+ import org.springframework.web.bind.annotation.RequestParam;
+
+ /**
+ * ClassName: CheckUpdateStatusDto <br/>
+ * Description: <br/>
+ * date: 2025/7/17 16:46<br/>
+ *
+ * @author zjh<br />
+ */
+ @Data
+ public class CheckUpdateStatusDto {
+ private String tjNumber;
+ private String advice;
+ private Integer checkStatus;
+ private String zhiyeJl;
+ private String zhiyeJg;
+ }
--
Gitblit v1.8.0