Merge remote-tracking branch '公司/master'

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

@@ -200,4 +200,6 @@ public class PatientexamlistController {
     }
 
 
+
+
 }

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

@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic;
-
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.apache.http.entity.ContentType;
 import cn.hutool.core.date.DateTime;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.applyregistration.controller.admin.applyform.devicevo.DeviceVO;
@@ -30,6 +33,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -234,4 +238,16 @@ public class ultrasonicController {
 
 
     }
+    @GetMapping("/getdcm")
+    @Operation(summary = "获取dcm数据")
+    @PreAuthorize("@ss.hasPermission('ultrasoniccom:ultrasonic:create')")
+    public CommonResult<String> GetDcmList()
+    {
+
+        String Res="{\"status\":\"success\",\"patientname\":\"朱晓珍\",\"hospital\":\"东营康惠健康体检中心\",\"seriesList\":[{\"thumbUrl\":\"/public/static/101缩略图.jpg\",\"seriesdesc\":\"CHEST\",\"instanceList\":[{\"imageid\":\"/public/static/49814@101@1@1.2.156.112605.189250948694021.20221211000237.4.28076.1.dcm\"}]},{\"thumbUrl\":\"/public/static/201缩略图.jpg\",\"seriesdesc\":\"CHEST\",\"instanceList\":[{\"imageid\":\"/public/static/49814@201@1@1.2.156.112605.189250948694021.20221211000325.4.16016.1.dcm\"},{\"imageid\":\"/public/static/49814@201@2@1.2.156.112605.189250948694021.20221211000325.4.16016.2.dcm\"},{\"imageid\":\"/public/static/49814@201@3@1.2.156.112605.189250948694021.20221211000325.4.16016.3.dcm\"},{\"imageid\":\"/public/static/49814@201@4@1.2.156.112605.189250948694021.20221211000326.4.16016.1.dcm\"},{\"imageid\":\"/public/static/49814@201@5@1.2.156.112605.189250948694021.20221211000326.4.16016.2.dcm\"}]}]}";
+
+        return success(Res);
+    }
+
+
 }

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

@@ -22,7 +22,7 @@
             <if test="regId != null">
                 AND regId = #{regId}
             </if>
-            <if test="select != null">
+            <if test="select != null and select != ''">
                 AND selected ='1'
             </if>
         </trim>