From c545063654fda09763ef9199ad4a8ce42efc0b12 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 10 一月 2024 17:53:51 +0800
Subject: [PATCH] zjh 2024/01/10--1
---
/dev/null | 31 ----------
ltkj-hosp/src/main/java/com/ltkj/hosp/dto/SaveTjPureToneTestDetil.java | 20 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java | 46 +++++++++++++--
ltkj-admin/pom.xml | 11 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java | 3
ltkj-admin/src/test/java/ImageTextExtractor.java | 23 +++++--
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java | 3 +
7 files changed, 87 insertions(+), 50 deletions(-)
diff --git a/ltkj-admin/pom.xml b/ltkj-admin/pom.xml
index bb00f68..59b6c25 100644
--- a/ltkj-admin/pom.xml
+++ b/ltkj-admin/pom.xml
@@ -24,11 +24,12 @@
<dependencies>
- <dependency>
- <groupId>net.sourceforge.tess4j</groupId>
- <artifactId>tess4j</artifactId>
- <version>4.5.4</version>
- </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.tess4j</groupId>
+ <artifactId>tess4j</artifactId>
+ <version>4.5.4</version>
+ </dependency>
<dependency>
<groupId>pdfbox</groupId>
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
index 25736a2..e651840 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
@@ -126,7 +126,8 @@
wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
final List<TjAskHistorys> list11 = historysService.list(wqq111);
one.setTjAskHistorysList(list11);
-
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
+ one.setTjLx(order.getTjCategory());
return AjaxResult.success(one);
}else {
TjAskMedicalHistory a = new TjAskMedicalHistory();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java
index 0f778a5..ce4fb22 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java
@@ -12,6 +12,7 @@
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.dto.SaveTjPureToneTestDetil;
import com.ltkj.hosp.service.*;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
@@ -47,18 +48,31 @@
private ITjOrderService orderService;
@Resource
private TjPureToneTestDetilService toneTestDetilService;
+ @Autowired
+ private ITjAskWorkLogService tjAskWorkLogService;
+ @Resource
+ private ITjOrderRemarkService remarkService;
@PostMapping("/saveTjPureToneTestDetil")
@ApiOperation(value = "淇濆瓨绾煶鍚槇缁撴灉娴嬪畾鍊兼帴鍙�")
- public AjaxResult saveTjPureToneTestDetil(@RequestBody List<TjPureToneTestDetil> pureToneTestDetils) {
- if(null !=pureToneTestDetils && pureToneTestDetils.size()>0){
- String pureTestId = pureToneTestDetils.get(0).getPureTestId();
+ public AjaxResult saveTjPureToneTestDetil(@RequestBody SaveTjPureToneTestDetil detil) {
+ if(null !=detil.getPureToneTestDetils() && detil.getPureToneTestDetils().size()>0){
+ String pureTestId = detil.getPureToneTestDetils().get(0).getPureTestId();
if(null==pureTestId){
return AjaxResult.error("鍙傛暟鏍煎紡鏈夎璇锋鏌ユ牳瀵�!");
}
toneTestDetilService.deletedTjPureToneTestDetilByPureTestId(pureTestId);
- toneTestDetilService.saveBatch(pureToneTestDetils);
+ toneTestDetilService.saveBatch(detil.getPureToneTestDetils());
+ String selectConfigByKey = configService.selectConfigByKey("cyty_pro_id");
+ if(null !=selectConfigByKey){
+ TjOrderRemark orderRemark = remarkService.getTjOrderRemarkByTjNumAndProParentId(detil.getTjNum(),selectConfigByKey);
+ if(null !=orderRemark){
+ orderRemark.setRemark(detil.getRemark());
+ orderRemark.setDoctorName(detil.getDoctorName());
+ remarkService.updateById(orderRemark);
+ }
+ }
return AjaxResult.success();
}
return AjaxResult.error("璇疯緭鍏ユ暟鎹�!");
@@ -66,8 +80,22 @@
@GetMapping("/getTjPureToneTestDetilList")
@ApiOperation(value = "鑾峰彇绾煶鍚槇缁撴灉娴嬪畾鍊兼帴鍙�")
- public AjaxResult getTjPureToneTestDetilList(@RequestParam String pureTestId) {
- return AjaxResult.success(toneTestDetilService.list(new LambdaQueryWrapper<TjPureToneTestDetil>().eq(TjPureToneTestDetil::getPureTestId,pureTestId)));
+ public AjaxResult getTjPureToneTestDetilList(@RequestParam String pureTestId,@RequestParam String tjNum) {
+ Map<String,Object> map=new HashMap<>();
+ map.put("detilList",null);
+ map.put("remark",null);
+ map.put("doctorName",null);
+ String selectConfigByKey = configService.selectConfigByKey("cyty_pro_id");
+ if(null !=selectConfigByKey){
+ TjOrderRemark orderRemark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNum,selectConfigByKey);
+ if(null !=orderRemark){
+ map.put("remark",orderRemark.getRemark());
+ map.put("doctorName",orderRemark.getDoctorName());
+ }
+ }
+ List<TjPureToneTestDetil> detilList = toneTestDetilService.list(new LambdaQueryWrapper<TjPureToneTestDetil>().eq(TjPureToneTestDetil::getPureTestId, pureTestId));
+ map.put("detilList",detilList);
+ return AjaxResult.success(map);
}
@@ -113,6 +141,12 @@
customer.setTjTime(order.getCreateTime());
customer.setTjType(order.getTjCategory());
}
+ LambdaQueryWrapper<TjAskWorkLog> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TjAskWorkLog::getTjNumber, customer.getTjNumber());
+ List<TjAskWorkLog> workLogs = tjAskWorkLogService.list(wqq);
+ if(null !=workLogs && workLogs.size()>0){
+ customer.setWorkLogs(workLogs);
+ }
map.put("list",entry.getValue());
map.put("customer",customer);
map.put("picturePath",configService.selectConfigByKey("TjPureToneTest"));
diff --git a/ltkj-admin/src/test/java/ITesseract.java b/ltkj-admin/src/test/java/ITesseract.java
deleted file mode 100644
index da755bc..0000000
--- a/ltkj-admin/src/test/java/ITesseract.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import lombok.Data;
-/**
- * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
- * @Author: zjh
- * @Date: 2024/1/9 0009 09:34
- */
-
-@Data
-public class ITesseract {
-
- private String datapath;
- private String language;
-}
diff --git a/ltkj-admin/src/test/java/ImageReader.java b/ltkj-admin/src/test/java/ImageReader.java
deleted file mode 100644
index 247a967..0000000
--- a/ltkj-admin/src/test/java/ImageReader.java
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-import net.sourceforge.tess4j.ITesseract;
-import net.sourceforge.tess4j.Tesseract;
-import net.sourceforge.tess4j.TesseractException;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-public class ImageReader {
- public static void main(String[] args) {
- try {
- // 鍔犺浇鍥剧墖
- File imageFile = new File("C:\\Users\\w\\Pictures\\Saved Pictures\\涓崕浜烘皯鍏卞拰鍥戒竾宀�.jpg");
- BufferedImage image = ImageIO.read(imageFile);
-
- // 鍥剧墖棰勫鐞�
- ITesseract tesseract = new Tesseract();
- tesseract.setDatapath("C:\\Users\\w\\Pictures\\Saved Pictures\\涓崕浜烘皯鍏卞拰鍥戒竾宀�.jpg"); // 璁剧疆Tesseract鐨勬暟鎹枃浠惰矾寰�
- tesseract.setLanguage("eng"); // 璁剧疆璇嗗埆璇█涓鸿嫳鏂�
- String result = tesseract.doOCR(image); // 杩涜鏂囧瓧璇嗗埆
-
- // 杈撳嚭缁撴灉
- System.out.println(result);
- } catch (IOException | TesseractException e) {
- e.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/ltkj-admin/src/test/java/ImageTextExtractor.java b/ltkj-admin/src/test/java/ImageTextExtractor.java
index 23c0b25..c02f45a 100644
--- a/ltkj-admin/src/test/java/ImageTextExtractor.java
+++ b/ltkj-admin/src/test/java/ImageTextExtractor.java
@@ -1,16 +1,24 @@
+import net.sourceforge.tess4j.ITesseract;
import net.sourceforge.tess4j.Tesseract;
import net.sourceforge.tess4j.TesseractException;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
import java.io.File;
+import java.io.IOException;
public class ImageTextExtractor {
- public static String extractTextFromImage(String imagePath) {
+ public static String extractTextFromImage(String imagePath) throws IOException {
File imageFile = new File(imagePath);
- Tesseract tesseract = new Tesseract();
+ ITesseract instance = new Tesseract(); // JNA Interface Mapping
try {
- tesseract.setLanguage("eng");
- String result = tesseract.doOCR(imageFile);
+ instance.setDatapath("D:\\develop\\OCR\\tessdata"); // set tessdata path
+ instance.setLanguage("chi_sim"); // set recognition language
+// instance.setLanguage("eng"); // set recognition language
+ instance.setTessVariable("user_defined_dpi","300");
+ BufferedImage image = ImageIO.read(imageFile);
+ String result = instance.doOCR(image);
return result;
} catch (TesseractException e) {
e.printStackTrace();
@@ -18,9 +26,10 @@
}
}
- public static void main(String[] args) {
- String imagePath = "C:\\Users\\w\\Pictures\\Saved Pictures\\涓崕浜烘皯鍏卞拰鍥戒竾宀�.jpg";
+ public static void main(String[] args) throws IOException {
+ String imagePath = "C:\\Users\\w\\Pictures\\Saved Pictures\\333.png";
String extractedText = extractTextFromImage(imagePath);
System.out.println(extractedText);
}
-}
\ No newline at end of file
+}
+
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
index af27811..2bc8138 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
@@ -313,6 +313,9 @@
@ApiModelProperty("鏂囧寲绋嬪害")
private String wenHua;
+ @ApiModelProperty(value = "鑱屼笟鍘嗗彶")
+ @TableField(exist = false)
+ private List<TjAskWorkLog> workLogs;
@Override
public String toString() {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/SaveTjPureToneTestDetil.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/SaveTjPureToneTestDetil.java
new file mode 100644
index 0000000..14a5a9b
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/dto/SaveTjPureToneTestDetil.java
@@ -0,0 +1,20 @@
+package com.ltkj.hosp.dto;
+
+import com.ltkj.hosp.domain.TjPureToneTestDetil;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
+ * @Author: zjh
+ * @Date: 2024/1/10 0010 14:58
+ */
+@Data
+public class SaveTjPureToneTestDetil {
+
+ private List<TjPureToneTestDetil> pureToneTestDetils;
+ private String tjNum ;
+ private String remark ;
+ private String doctorName;
+}
--
Gitblit v1.8.0