Compare commits

..

No commits in common. "2edb0b4a3e799ce28fd6665392a154a740bca593" and "2c57beb0b8eef17246eac87b34fdd40197e8f648" have entirely different histories.

3 changed files with 2 additions and 20 deletions

View File

@ -1,8 +1,5 @@
package cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic; 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.hutool.core.date.DateTime;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.applyregistration.controller.admin.applyform.devicevo.DeviceVO; import cn.iocoder.yudao.module.applyregistration.controller.admin.applyform.devicevo.DeviceVO;
@ -33,7 +30,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -238,16 +234,4 @@ 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);
}
} }

View File

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