zjh 2024/01/10--1

zjh

2024-01-10 c545063654fda09763ef9199ad4a8ce42efc0b12

zjh 2024/01/10--1

 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>

 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();

 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"));

 ltkj-admin/src/test/java/ITesseract.java

File was deleted

 ltkj-admin/src/test/java/ImageReader.java

File was deleted

 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);
    }
}
}


 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() {

 ltkj-hosp/src/main/java/com/ltkj/hosp/dto/SaveTjPureToneTestDetil.java

New file
@@ -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;
}