lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch '公司/master'

Browse Source 
# Conflicts:
#	yudao-server/src/main/resources/application.yaml
This commit is contained in:
lxd 2024-10-21 15:42:57 +08:00
commit 6d37ec24cc
7 changed files with 95 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java
View File

@ -73,6 +73,7 @@ public class PatientexamlistController {
private OrgService OrgService; private OrgService OrgService;
@Resource @Resource
private OrgUnitService Service; private OrgUnitService Service;
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建PACS检查列表") @Operation(summary = "创建PACS检查列表")
@PreAuthorize("@ss.hasPermission('tblist:patientexamlist:create')") @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:create')")
@ -134,11 +135,18 @@ public class PatientexamlistController {
.filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().contains("US"))) .filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().contains("US")))
.sorted(Comparator.comparing(PatientexamlistDO::getExamDate, Comparator.nullsLast(Comparator.reverseOrder()))) // 降序排序，null值排在后面 .sorted(Comparator.comparing(PatientexamlistDO::getExamDate, Comparator.nullsLast(Comparator.reverseOrder()))) // 降序排序，null值排在后面
.collect(Collectors.toList()); .collect(Collectors.toList());
} else if (devicetype != null && devicetype.contains("CSH1"))//表示只查询病理工作台的数据
{
// 筛选条件：
doList = pageResult.getList().stream()
.filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().contains("CSH1")))
.sorted(Comparator.comparing(PatientexamlistDO::getExamDate, Comparator.nullsLast(Comparator.reverseOrder()))) // 降序排序，null值排在后面
.collect(Collectors.toList());
} else if (devicetype != null && !devicetype.trim().isEmpty())//表示只查询影像的数据 } else if (devicetype != null && !devicetype.trim().isEmpty())//表示只查询影像的数据
{ {
// 筛选条件： // 筛选条件：
doList = pageResult.getList().stream() doList = pageResult.getList().stream()
.filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().contains("US"))) .filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().contains("US")) && !(PatientexamlistDO.getDeviceType().contains("CSH1")))
.sorted(Comparator.comparing(PatientexamlistDO::getExamDate, Comparator.nullsLast(Comparator.reverseOrder()))) // 降序排序，null值排在后面 .sorted(Comparator.comparing(PatientexamlistDO::getExamDate, Comparator.nullsLast(Comparator.reverseOrder()))) // 降序排序，null值排在后面
.collect(Collectors.toList()); .collect(Collectors.toList());
} else //devicetype为空，查询全部数据 } else //devicetype为空，查询全部数据
@ -240,17 +248,15 @@ public class PatientexamlistController {
//先拿orgid查询出来对应的org表的上级机构代码 //先拿orgid查询出来对应的org表的上级机构代码
String hiorgid = OrgService.GetOrgHiORGId(orgId); String hiorgid = OrgService.GetOrgHiORGId(orgId);
log.debug("查询出来对应的org表的上级机构代码" + hiorgid); log.debug("查询出来对应的org表的上级机构代码" + hiorgid);
if (hiorgid!=null &&!hiorgid.isEmpty()) { if (hiorgid != null && !hiorgid.isEmpty()) {
PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO(); PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO();
updateReqVO.setId(id); updateReqVO.setId(id);
updateReqVO.setHighLevelOrgId(hiorgid); updateReqVO.setHighLevelOrgId(hiorgid);
updateReqVO.setApplicationDate(LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), updateReqVO.setApplicationDate(LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
patientexamlistService.updatePatientexamlist(updateReqVO); patientexamlistService.updatePatientexamlist(updateReqVO);
} } else {
else return error(9999, "上级机构为空,请先设置上级机构");
{
return error(9999,"上级机构为空,请先设置上级机构");
} }
return success("申请成功"); return success("申请成功");
} }
@ -288,42 +294,38 @@ public class PatientexamlistController {
patientexamlistService.updatePatientexamlist(updateReqVO); patientexamlistService.updatePatientexamlist(updateReqVO);
return success(true); return success(true);
} }
@GetMapping("/WholeDiagFlagCount") @GetMapping("/WholeDiagFlagCount")
@Operation(summary = "首页饼状图统计") @Operation(summary = "首页饼状图统计")
public CommonResult<PatientexamlistCountVO> GetWholeDiagFlagCount() public CommonResult<PatientexamlistCountVO> GetWholeDiagFlagCount() {
{
//获取当前登陆用户 //获取当前登陆用户
AdminUserDO user = userService.getUser(getLoginUserId()); AdminUserDO user = userService.getUser(getLoginUserId());
PatientexamlistCountVO patientexamlistCountVO= patientexamlistService.GetWholeDiagFlagCount(user.getOrgId()); PatientexamlistCountVO patientexamlistCountVO = patientexamlistService.GetWholeDiagFlagCount(user.getOrgId());
return success(patientexamlistCountVO); return success(patientexamlistCountVO);
} }
@GetMapping("/GetDateYYZDYXCount") @GetMapping("/GetDateYYZDYXCount")
@Operation(summary = "首页折线图统计") @Operation(summary = "首页折线图统计")
public CommonResult<List<PatientexamlistCountVO>> GetDateYYZDYXCount() public CommonResult<List<PatientexamlistCountVO>> GetDateYYZDYXCount() {
{
//获取当前登陆用户 //获取当前登陆用户
AdminUserDO user = userService.getUser(getLoginUserId()); AdminUserDO user = userService.getUser(getLoginUserId());
List<PatientexamlistCountVO> patientexamlistCountVO= patientexamlistService.GetDateWholeDiagFlagCount(user.getOrgId()); List<PatientexamlistCountVO> patientexamlistCountVO = patientexamlistService.GetDateWholeDiagFlagCount(user.getOrgId());
return success(patientexamlistCountVO); return success(patientexamlistCountVO);
} }
@GetMapping("/CollectAndCancellation") @GetMapping("/CollectAndCancellation")
@Operation(summary = "收藏以及取消") @Operation(summary = "收藏以及取消")
public CommonResult<Boolean> CollectAndCancellation(@RequestParam("id") String id,@RequestParam("type") String type) public CommonResult<Boolean> CollectAndCancellation(@RequestParam("id") String id, @RequestParam("type") String type) {
{
LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO(); PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO();
updateReqVO.setId(id); updateReqVO.setId(id);
updateReqVO.setIsFavourite(type); updateReqVO.setIsFavourite(type);
if(type.equals("1")) if (type.equals("1")) {
{
updateReqVO.setFavouriteTime(dateTime); updateReqVO.setFavouriteTime(dateTime);
} } else if (type.equals("0")) {
else if(type.equals("0"))
{
updateReqVO.setFavouriteTime(null); updateReqVO.setFavouriteTime(null);
} }
@ -333,34 +335,27 @@ public class PatientexamlistController {
@GetMapping("/GetAnalysisInfo") @GetMapping("/GetAnalysisInfo")
@Operation(summary = "获取报告信息") @Operation(summary = "获取报告信息")
public CommonResult<String> GetAnalysisInfo(@RequestParam(value = "examId", required = false) String examId,@RequestParam("regId") String regId,@RequestParam("orgId") String orgId) public CommonResult<String> GetAnalysisInfo(@RequestParam(value = "examId", required = false) String examId, @RequestParam("regId") String regId, @RequestParam("orgId") String orgId) {
{ String msg = "";
String msg="";
if (regId!=null &&!regId.isEmpty() && orgId!=null &&!orgId.isEmpty()) if (regId != null && !regId.isEmpty() && orgId != null && !orgId.isEmpty()) {
{ String CloudDicom = "";
String CloudDicom=""; OrgUnitDO unitDO = Service.getonekey(orgId);
OrgUnitDO unitDO= Service.getonekey(orgId); if (unitDO != null) {
if(unitDO!=null) CloudDicom = unitDO.getCloudDicom();
{
CloudDicom= unitDO.getCloudDicom();
} }
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("regId", regId); params.put("regId", regId);
params.put("orgId", orgId); params.put("orgId", orgId);
if(examId!=null&&!examId.isEmpty()) if (examId != null && !examId.isEmpty()) {
{
params.put("examId", examId); params.put("examId", examId);
} }
List<AnalysisInfoVO> analysisInfoVOS=new ArrayList<>(); List<AnalysisInfoVO> analysisInfoVOS = new ArrayList<>();
List<PatientexamlistDO> patientexamlistDOList= patientexamlistService.selectMp(params); List<PatientexamlistDO> patientexamlistDOList = patientexamlistService.selectMp(params);
if(!patientexamlistDOList.isEmpty()) if (!patientexamlistDOList.isEmpty()) {
{ for (PatientexamlistDO patientexamlistDO : patientexamlistDOList) {
for (PatientexamlistDO patientexamlistDO:patientexamlistDOList) if (patientexamlistDO.getDiagDoctor() != null && !patientexamlistDO.getDiagDoctor().isEmpty()) {
{ AnalysisInfoVO infoVO = new AnalysisInfoVO();
if(patientexamlistDO.getDiagDoctor()!=null &&!patientexamlistDO.getDiagDoctor().isEmpty())
{
AnalysisInfoVO infoVO=new AnalysisInfoVO();
infoVO.setExamId(patientexamlistDO.getExamId()); infoVO.setExamId(patientexamlistDO.getExamId());
infoVO.setRegId(patientexamlistDO.getRegId()); infoVO.setRegId(patientexamlistDO.getRegId());
infoVO.setPName(patientexamlistDO.getPName()); infoVO.setPName(patientexamlistDO.getPName());
@ -373,30 +368,25 @@ public class PatientexamlistController {
infoVO.setDiagDoctor(patientexamlistDO.getDiagDoctor()); infoVO.setDiagDoctor(patientexamlistDO.getDiagDoctor());
infoVO.setDiagDate(patientexamlistDO.getDiagDate() != null ? patientexamlistDO.getDiagDate().toString() : null); infoVO.setDiagDate(patientexamlistDO.getDiagDate() != null ? patientexamlistDO.getDiagDate().toString() : null);
infoVO.setReviewDoctor(patientexamlistDO.getReviewDoctor()); infoVO.setReviewDoctor(patientexamlistDO.getReviewDoctor());
infoVO.setReviewDate(patientexamlistDO.getReviewDate()!=null ?patientexamlistDO.getReviewDate().toString():null); infoVO.setReviewDate(patientexamlistDO.getReviewDate() != null ? patientexamlistDO.getReviewDate().toString() : null);
infoVO.setCloudurl(CloudDicom+"/?no="+regId+"&orgId="+orgId);//http://1.119.159.138:48082/flyCloudDicom infoVO.setCloudurl(CloudDicom + "/?no=" + regId + "&orgId=" + orgId);//http://1.119.159.138:48082/flyCloudDicom
analysisInfoVOS.add(infoVO); analysisInfoVOS.add(infoVO);
} }
} }
if(!analysisInfoVOS.isEmpty()) if (!analysisInfoVOS.isEmpty()) {
{
Gson gson = new GsonBuilder() Gson gson = new GsonBuilder()
.serializeSpecialFloatingPointValues() // 序列化特殊浮点数值（如 NaN, Infinity） .serializeSpecialFloatingPointValues() // 序列化特殊浮点数值（如 NaN, Infinity）
.disableHtmlEscaping() // 禁用 HTML 转义 .disableHtmlEscaping() // 禁用 HTML 转义
.create(); .create();
msg= gson.toJson(analysisInfoVOS); msg = gson.toJson(analysisInfoVOS);
} } else {
else msg = "未查询到数据或数据未进行分析";
{
msg="未查询到数据或数据未进行分析";
} }
} }
} } else {
else msg = "参数为空";
{
msg="参数为空";
} }
return success(msg); return success(msg);
@ -404,15 +394,14 @@ public class PatientexamlistController {
@PostMapping("/ftppdf") @PostMapping("/ftppdf")
@Operation(summary = "获取pdf上传ftp") @Operation(summary = "获取pdf上传ftp")
public void FtpPdf(@RequestBody inspdfscreenshotVO insimagescreenshotVO) public void FtpPdf(@RequestBody inspdfscreenshotVO insimagescreenshotVO) {
{
String base64String = insimagescreenshotVO.getImagebase(); String base64String = insimagescreenshotVO.getImagebase();
String ftpServer = "114.55.171.231"; String ftpServer = "114.55.171.231";
int ftpPort = 21; // FTP端口，默认为21 int ftpPort = 21; // FTP端口，默认为21
String ftpUser = "pacs"; String ftpUser = "pacs";
String ftpPassword = "pacs"; String ftpPassword = "pacs";
String uploadPath = "/"; String uploadPath = "/";
String fileName = System.currentTimeMillis()+".pdf"; String fileName = System.currentTimeMillis() + ".pdf";
FTPClient ftpClient = new FTPClient(); FTPClient ftpClient = new FTPClient();
@ -442,7 +431,7 @@ public class PatientexamlistController {
AdminUserDO user = userService.getUser(getLoginUserId()); AdminUserDO user = userService.getUser(getLoginUserId());
PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO(); PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO();
updateReqVO.setId(insimagescreenshotVO.getID()); updateReqVO.setId(insimagescreenshotVO.getID());
updateReqVO.setPdfurl("http://114.55.171.231:48082/"+fileName); updateReqVO.setPdfurl("http://114.55.171.231:48082/" + fileName);
patientexamlistService.updatePatientexamlist(updateReqVO); patientexamlistService.updatePatientexamlist(updateReqVO);
} else { } else {
System.out.println("文件上传失败"); System.out.println("文件上传失败");

17
yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java
View File

@ -226,6 +226,16 @@ public class ultrasonicController {
} }
} }
} }
@GetMapping("/getpathologyimglist")
@Operation(summary = "获取病理图片列表")
@Parameter(name = "orgid", description = "机构ID", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('ultrasoniccom:ultrasonic:create')")
public CommonResult<List<medicalimgDO>> getPathologyImgList(@RequestParam("orgID") String orgId, @RequestParam("regID") String regId, @RequestParam("select") String select) {
List<medicalimgDO> devicelist = ultrasonicService.getPathologyImgList(orgId, regId, select);
return success(BeanUtils.toBean(devicelist, medicalimgDO.class));
}
@GetMapping("/getimageslist") @GetMapping("/getimageslist")
@Operation(summary = "获取图片列表") @Operation(summary = "获取图片列表")
@Parameter(name = "orgid", description = "机构ID", required = true, example = "1024") @Parameter(name = "orgid", description = "机构ID", required = true, example = "1024")
@ -262,12 +272,12 @@ public class ultrasonicController {
//新增对象 //新增对象
medicalimgDO medicalimgDO = new medicalimgDO(); medicalimgDO medicalimgDO = new medicalimgDO();
medicalimgDO.setId(s.getId()); medicalimgDO.setId(s.getId());
if (!s.getIsDelete().isEmpty()) { if (s.getIsDelete() != null && !s.getIsDelete().isEmpty()) {
medicalimgDO.setIsDelete(s.getIsDelete()); medicalimgDO.setIsDelete(s.getIsDelete());
medicalimgDO.setDeletePerson(s.getDeletePerson()); medicalimgDO.setDeletePerson(s.getDeletePerson());
medicalimgDO.setDeleteDate(dateTime); medicalimgDO.setDeleteDate(dateTime);
} }
if (!s.getSelected().isEmpty()) { if (s.getSelected() != null && !s.getSelected().isEmpty()) {
medicalimgDO.setSelected(s.getSelected()); medicalimgDO.setSelected(s.getSelected());
} }
doList.add(medicalimgDO); doList.add(medicalimgDO);
@ -468,7 +478,10 @@ public class ultrasonicController {
medicalimgDO.setRegId(insimagescreenshotVO.getID()); medicalimgDO.setRegId(insimagescreenshotVO.getID());
medicalimgDO.setOrgId(user.getOrgId()); medicalimgDO.setOrgId(user.getOrgId());
medicalimgDO.setSelected("0"); medicalimgDO.setSelected("0");
if (insimagescreenshotVO.getImgType() == null || insimagescreenshotVO.getImgType().trim().equals(""))
medicalimgDO.setImgType("1"); medicalimgDO.setImgType("1");
else
medicalimgDO.setImgType(insimagescreenshotVO.getImgType().trim());
int count=medicalimgService.insimage(medicalimgDO); int count=medicalimgService.insimage(medicalimgDO);
} else { } else {
System.out.println("文件上传失败"); System.out.println("文件上传失败");

2
yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/medicalimg/medicalimgMapper.java
View File

@ -14,6 +14,8 @@ public interface medicalimgMapper extends BaseMapperX<medicalimgDO> {
List<medicalimgDO> getmedicalimgist(@Param("orgId") String orgId,@Param("regId") String regId,@Param("select") String select); List<medicalimgDO> getmedicalimgist(@Param("orgId") String orgId,@Param("regId") String regId,@Param("select") String select);
List<medicalimgDO> getPathologyImgList(@Param("orgId") String orgId,@Param("regId") String regId,@Param("select") String select);
List<medicalimgDO> getmedicalimgist(UserDataDocumentFactory UserDataDocumentFactory); List<medicalimgDO> getmedicalimgist(UserDataDocumentFactory UserDataDocumentFactory);
String GetImageVideo(@Param("orgId") String orgId,@Param("regId") String regId); String GetImageVideo(@Param("orgId") String orgId,@Param("regId") String regId);

1
yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicService.java
View File

@ -21,6 +21,7 @@ public interface ultrasonicService extends IService<ultrasonicDO> {
*/ */
List<ultrasonicDO> getreporttemplate(); List<ultrasonicDO> getreporttemplate();
List<medicalimgDO> getPathologyImgList(@Param("orgId") String orgId, @Param("regId") String regId,@Param("select") String select);
List<medicalimgDO> getmedicalimgist(@Param("orgId") String orgId, @Param("regId") String regId,@Param("select") String select); List<medicalimgDO> getmedicalimgist(@Param("orgId") String orgId, @Param("regId") String regId,@Param("select") String select);

5
yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicServiceImpl.java
View File

@ -29,6 +29,11 @@ public class ultrasonicServiceImpl extends ServiceImpl<ultrasonicMapper, ultraso
return ultrasonicMapper.getreporttemplist(); return ultrasonicMapper.getreporttemplist();
} }
@Override
public List<medicalimgDO> getPathologyImgList(String orgId, String regId, String select) {
return medicalimgMapper.getPathologyImgList(orgId,regId,select);
}
@Override @Override
public List<medicalimgDO> getmedicalimgist(String orgId, String regId,String select) { public List<medicalimgDO> getmedicalimgist(String orgId, String regId,String select) {
return medicalimgMapper.getmedicalimgist(orgId,regId,select); return medicalimgMapper.getmedicalimgist(orgId,regId,select);

19
yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/resources/mapper/ultrasonic/medicalimgMapper.xml
View File

@ -9,6 +9,25 @@
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
--> -->
<select id="getPathologyImgList" parameterType="string" resultType="cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg.medicalimgDO">
SELECT * FROM tb_medicalimg
WHERE
<trim prefixOverrides="and | or">
<if test="orgId != null or regId != null">
AND (isDelete != '1' OR isDelete IS NULL) AND imgType='3'
</if>
<if test="orgId != null">
AND orgId = #{orgId}
</if>
<if test="regId != null">
AND regId = #{regId}
</if>
<if test="select != null and select != ''">
AND selected ='1'
</if>
</trim>
</select>
<select id="getmedicalimgist" parameterType="string" resultType="cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg.medicalimgDO"> <select id="getmedicalimgist" parameterType="string" resultType="cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.medicalimg.medicalimgDO">
SELECT * FROM tb_medicalimg SELECT * FROM tb_medicalimg
WHERE WHERE

2
yudao-server/src/main/resources/application.yaml
View File

@ -164,6 +164,7 @@ yudao:
- /admin-api/tblist/patientexamlist/GetAnalysisInfo - /admin-api/tblist/patientexamlist/GetAnalysisInfo
- /admin-api/system/jwtToken/getToken - /admin-api/system/jwtToken/getToken
- /admin-api/applyregistration/applyform/GetPatientPDFDcm - /admin-api/applyregistration/applyform/GetPatientPDFDcm
- /admin-api/ultrasoniccom/ultrasonic/ftpimage
websocket: websocket:
enable: true # websocket的开关 enable: true # websocket的开关
path: /infra/ws # 路径 path: /infra/ws # 路径
@ -213,6 +214,7 @@ yudao:
- /admin-api/tblist/patientexamlist/GetAnalysisInfo - /admin-api/tblist/patientexamlist/GetAnalysisInfo
- /admin-api/system/jwtToken/getToken - /admin-api/system/jwtToken/getToken
- /admin-api/applyregistration/applyform/GetPatientPDFDcm - /admin-api/applyregistration/applyform/GetPatientPDFDcm
- /admin-api/ultrasoniccom/ultrasonic/ftpimage
ignore-tables: ignore-tables:
- system_tenant - system_tenant
- system_tenant_package - system_tenant_package