Merge remote-tracking branch '公司/master'

# Conflicts:
#	yudao-server/src/main/resources/application.yaml

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

@@ -73,6 +73,7 @@ public class PatientexamlistController {
     private OrgService OrgService;
     @Resource
     private OrgUnitService Service;
+
     @PostMapping("/create")
     @Operation(summary = "创建PACS检查列表")
     @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:create')")
@@ -134,11 +135,18 @@ public class PatientexamlistController {
                     .filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().contains("US")))
                     .sorted(Comparator.comparing(PatientexamlistDO::getExamDate, Comparator.nullsLast(Comparator.reverseOrder()))) // 降序排序，null值排在后面
                     .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())//表示只查询影像的数据
         {
             // 筛选条件：
             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值排在后面
                     .collect(Collectors.toList());
         } else //devicetype为空，查询全部数据
@@ -247,9 +255,7 @@ public class PatientexamlistController {
             updateReqVO.setApplicationDate(LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
                     DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             patientexamlistService.updatePatientexamlist(updateReqVO);
-        }
+        } else {
-        else
-        {
             return error(9999, "上级机构为空,请先设置上级机构");
         }
         return success("申请成功");
@@ -288,10 +294,10 @@ public class PatientexamlistController {
         patientexamlistService.updatePatientexamlist(updateReqVO);
         return success(true);
     }
+
     @GetMapping("/WholeDiagFlagCount")
     @Operation(summary = "首页饼状图统计")
-    public  CommonResult<PatientexamlistCountVO> GetWholeDiagFlagCount()
+    public CommonResult<PatientexamlistCountVO> GetWholeDiagFlagCount() {
-    {
         //获取当前登陆用户
         AdminUserDO user = userService.getUser(getLoginUserId());
         PatientexamlistCountVO patientexamlistCountVO = patientexamlistService.GetWholeDiagFlagCount(user.getOrgId());
@@ -301,29 +307,25 @@ public class PatientexamlistController {
 
     @GetMapping("/GetDateYYZDYXCount")
     @Operation(summary = "首页折线图统计")
-    public  CommonResult<List<PatientexamlistCountVO>> GetDateYYZDYXCount()
+    public CommonResult<List<PatientexamlistCountVO>> GetDateYYZDYXCount() {
-    {
         //获取当前登陆用户
         AdminUserDO user = userService.getUser(getLoginUserId());
         List<PatientexamlistCountVO> patientexamlistCountVO = patientexamlistService.GetDateWholeDiagFlagCount(user.getOrgId());
         return success(patientexamlistCountVO);
 
     }
+
     @GetMapping("/CollectAndCancellation")
     @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")),
                 DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO();
         updateReqVO.setId(id);
         updateReqVO.setIsFavourite(type);
-        if(type.equals("1"))
+        if (type.equals("1")) {
-        {
             updateReqVO.setFavouriteTime(dateTime);
-        }
+        } else if (type.equals("0")) {
-        else if(type.equals("0"))
-        {
             updateReqVO.setFavouriteTime(null);
         }
 
@@ -333,33 +335,26 @@ public class PatientexamlistController {
 
     @GetMapping("/GetAnalysisInfo")
     @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 = "";
 
-        if (regId!=null &&!regId.isEmpty() && orgId!=null &&!orgId.isEmpty())
+        if (regId != null && !regId.isEmpty() && orgId != null && !orgId.isEmpty()) {
-        {
             String CloudDicom = "";
             OrgUnitDO unitDO = Service.getonekey(orgId);
-            if(unitDO!=null)
+            if (unitDO != null) {
-            {
                 CloudDicom = unitDO.getCloudDicom();
             }
             Map<String, Object> params = new HashMap<>();
             params.put("regId", regId);
             params.put("orgId", orgId);
-            if(examId!=null&&!examId.isEmpty())
+            if (examId != null && !examId.isEmpty()) {
-            {
                 params.put("examId", examId);
             }
             List<AnalysisInfoVO> analysisInfoVOS = new ArrayList<>();
             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()) {
-                {
-                    if(patientexamlistDO.getDiagDoctor()!=null &&!patientexamlistDO.getDiagDoctor().isEmpty())
-                    {
                         AnalysisInfoVO infoVO = new AnalysisInfoVO();
                         infoVO.setExamId(patientexamlistDO.getExamId());
                         infoVO.setRegId(patientexamlistDO.getRegId());
@@ -379,23 +374,18 @@ public class PatientexamlistController {
                     }
 
                 }
-                if(!analysisInfoVOS.isEmpty())
+                if (!analysisInfoVOS.isEmpty()) {
-                 {
                     Gson gson = new GsonBuilder()
                             .serializeSpecialFloatingPointValues() // 序列化特殊浮点数值（如 NaN, Infinity）
                             .disableHtmlEscaping() // 禁用 HTML 转义
                             .create();
                     msg = gson.toJson(analysisInfoVOS);
-                }
+                } else {
-                else
-                {
                     msg = "未查询到数据或数据未进行分析";
                 }
 
             }
-        }
+        } else {
-        else
-        {
             msg = "参数为空";
         }
 
@@ -404,8 +394,7 @@ public class PatientexamlistController {
 
     @PostMapping("/ftppdf")
     @Operation(summary = "获取pdf上传ftp")
-    public  void FtpPdf(@RequestBody inspdfscreenshotVO insimagescreenshotVO)
+    public void FtpPdf(@RequestBody inspdfscreenshotVO insimagescreenshotVO) {
-    {
         String base64String = insimagescreenshotVO.getImagebase();
         String ftpServer = "114.55.171.231";
         int ftpPort = 21; // FTP端口，默认为21

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

@@ -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")
     @Operation(summary = "获取图片列表")
     @Parameter(name = "orgid", description = "机构ID", required = true, example = "1024")
@@ -262,12 +272,12 @@ public class ultrasonicController {
                 //新增对象
                 medicalimgDO medicalimgDO = new medicalimgDO();
                 medicalimgDO.setId(s.getId());
-                if (!s.getIsDelete().isEmpty()) {
+                if (s.getIsDelete() != null && !s.getIsDelete().isEmpty()) {
                     medicalimgDO.setIsDelete(s.getIsDelete());
                     medicalimgDO.setDeletePerson(s.getDeletePerson());
                     medicalimgDO.setDeleteDate(dateTime);
                 }
-                if (!s.getSelected().isEmpty()) {
+                if (s.getSelected() != null && !s.getSelected().isEmpty()) {
                     medicalimgDO.setSelected(s.getSelected());
                 }
                 doList.add(medicalimgDO);
@@ -468,7 +478,10 @@ public class ultrasonicController {
                medicalimgDO.setRegId(insimagescreenshotVO.getID());
                medicalimgDO.setOrgId(user.getOrgId());
                medicalimgDO.setSelected("0");
+               if (insimagescreenshotVO.getImgType() == null || insimagescreenshotVO.getImgType().trim().equals(""))
                    medicalimgDO.setImgType("1");
+               else
+                   medicalimgDO.setImgType(insimagescreenshotVO.getImgType().trim());
               int count=medicalimgService.insimage(medicalimgDO);
            } else {
                System.out.println("文件上传失败");

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

@@ -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> getPathologyImgList(@Param("orgId") String orgId,@Param("regId") String regId,@Param("select") String select);
+
     List<medicalimgDO> getmedicalimgist(UserDataDocumentFactory UserDataDocumentFactory);
 
     String GetImageVideo(@Param("orgId") String orgId,@Param("regId") String regId);

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

@@ -21,6 +21,7 @@ public interface ultrasonicService  extends IService<ultrasonicDO> {
      */
     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);
 

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

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

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

@@ -9,6 +9,25 @@
         文档可见：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 * FROM tb_medicalimg
         WHERE

yudao-server/src/main/resources/application.yaml

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