zjh
2024-07-31 7e31516ad9ea863cba1d592e2a7b5c37e74e55a0
zjh 2024/07/31-1
4个文件已修改
1个文件已添加
31 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/ShenGaoTiZhongVo.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -19,6 +19,7 @@
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import io.swagger.annotations.Api;
@@ -334,7 +335,7 @@
    @GetMapping("/getShenGaoTiZhong")
    @ApiOperation(value = "小程序-体检报告查询详情")
    public AjaxResult getShenGaoTiZhong(@RequestParam @ApiParam(value = "体检号") String tjNumber) {
        Map<String, Object> objectMap = new HashMap<>();
//        Map<String, Object> objectMap = new HashMap<>();
        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
        wq1.eq(TjOrder::getTjNumber, tjNumber);
        wq1.eq(TjOrder::getCheckStatus, 1);
@@ -343,7 +344,7 @@
            return AjaxResult.success("体检暂未完成!!");
        }
        List<Map<String, Object>> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
        List<ShenGaoTiZhongVo> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
//        if(null !=maps && maps.size()>0){
//            for (Map<String, Object> map : maps) {
//                if (map.get("") == null) {
@@ -373,7 +374,7 @@
//                }
//            }
//        }
        log.info("ltkj {}的体检报告查询详情"+maps,tjNumber);
        return AjaxResult.success(maps);
    }
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjOrderDetail;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import org.apache.ibatis.annotations.*;
/**
@@ -224,5 +225,5 @@
            "\t\t\tOR c.pro_name LIKE '%收缩压%' \n" +
            "\t\tOR c.pro_name LIKE '%舒张压%' \n" +
            "\t)) aa ")
    List<Map<String,Object>> getShenGaoTiZhongList(String tjNum);
    List<ShenGaoTiZhongVo> getShenGaoTiZhongList(String tjNum);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -7,6 +7,7 @@
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.hosp.domain.TjOrderDetail;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import org.apache.ibatis.annotations.Select;
/**
@@ -115,5 +116,5 @@
    List<Map<String,Object>> getShenGaoTiZhongList(String tjNum);
    List<ShenGaoTiZhongVo> getShenGaoTiZhongList(String tjNum);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -7,6 +7,7 @@
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ltkj.hosp.mapper.TjOrderDetailMapper;
@@ -186,7 +187,7 @@
    }
    @Override
    public List<Map<String, Object>> getShenGaoTiZhongList(String tjNum) {
    public List<ShenGaoTiZhongVo> getShenGaoTiZhongList(String tjNum) {
        return tjOrderDetailMapper.getShenGaoTiZhongList(tjNum);
    }
ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/ShenGaoTiZhongVo.java
New file
@@ -0,0 +1,15 @@
package com.ltkj.hosp.vodomain;/*
 * @Authot:zjh
 * @Date:  2024-07-31   16:49
 * */
import lombok.Data;
@Data
public class ShenGaoTiZhongVo {
   private String tizhong;
   private String tizhongzhishu;
   private String shousuoya;
   private String shenggao;
   private String shuzhangya;
}