1.develop

src/main/java/com/xwd/hospital/server/config/SaTokenConfig.java

@@ -40,6 +40,7 @@ public class SaTokenConfig implements WebMvcConfigurer {
                 .excludePathPatterns("/v1/system/user/register")
                 .excludePathPatterns("/v1/system/user/miniAppLogin")
                 .excludePathPatterns("/v1/system/user/miniAppRegister")
+                .excludePathPatterns("/v1/system/user/getUrlLink")
                 .excludePathPatterns("/v1/system/user/wxUpdate")
                 .excludePathPatterns("/v1/system/user/getPhoneNumber")
                 .excludePathPatterns("/v1/system/user/checkUserName")

src/main/java/com/xwd/hospital/server/dto/PictureDto.java

@@ -4,7 +4,13 @@ import lombok.Data;
 
 @Data
 public class PictureDto {
+    private Long id;
+
     private String imageUrl;
 
     private String sourceFileUrl;
+
+    private String pictureRemark;
+
+    private Long isShowApp;
 }

src/main/java/com/xwd/hospital/server/dto/ReportDto.java

@@ -11,6 +11,7 @@ import java.util.List;
 
 @Data
 public class ReportDto {
+    private Long id;
     /**
      * 患者姓名
      */
@@ -66,6 +67,8 @@ public class ReportDto {
     @Schema(description = "报告医生", nullable = false)
     private String reportDoctor;
 
+    private String doctorAsks;
+
     /**
      * 报告时间
      */

src/main/java/com/xwd/hospital/server/rest/MedicalReportController.java

@@ -172,6 +172,22 @@ public class MedicalReportController extends BaseController<MedicalReportService
 
     }
 
+    /**
+     * 修改影像报告
+     *
+     */
+    @PostMapping("/updateReport")
+    @Operation(summary = "修改影像报告")
+    public ApiResponse updateReport(@RequestBody ReportDto dto, @AuthUser User user) {
+        boolean result = this.service.updateReport(dto);
+        if(result){
+            return ApiResponse.ok(result);
+        }else {
+            return ApiResponse.fail(ApiCode.FAILED.getCode(),"身份证信息不正确");
+        }
+
+    }
+
     /**
      * 我的医嘱
      *

src/main/java/com/xwd/hospital/server/rest/UserController.java

@@ -13,6 +13,8 @@ import java.io.OutputStream;
 import java.util.List;
 import java.util.Arrays;
 
+import cn.binarywang.wx.miniapp.bean.urllink.GenerateUrlLinkRequest;
+import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.StpUtil;
@@ -39,6 +41,7 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -422,4 +425,10 @@ public class UserController extends BaseController<UserService, User, UserParam>
         this.service.createDoctorWorkTime(doctorId);
         return ApiResponse.ok(null);
     }
+
+    @PostMapping("/getUrlLink")
+    @Operation(summary = "getUrlLink")
+    public ApiResponse<String> getUrlLink() {
+        return ApiResponse.ok(this.service.getUrlLink());
+    }
 }

src/main/java/com/xwd/hospital/server/service/MedicalReportService.java

@@ -19,6 +19,8 @@ public interface MedicalReportService extends BaseService<MedicalReport> {
 
     boolean uploadReport(ReportDto dto);
 
+    boolean updateReport(ReportDto dto);
+
     MedicalReport myDoctorAsk();
 
     IPage<DoctorAskDto> queryDoctorAskList(Page page,String state);

src/main/java/com/xwd/hospital/server/service/UserService.java

@@ -95,4 +95,6 @@ public interface UserService extends BaseService<User> {
     CaseAndReportCountDto getUserCaseAndReportCount(Long userInfoId);
 
     void createDoctorWorkTime(Long doctorId);
+
+    String getUrlLink();
 }

src/main/java/com/xwd/hospital/server/service/impl/MedicalReportServiceImpl.java

@@ -12,8 +12,10 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Objects;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdcardUtil;
@@ -133,7 +135,8 @@ public class MedicalReportServiceImpl extends ServiceImpl<MedicalReportMapper, M
                 picture.setMedicalReportId(medicalReport.getId());
                 picture.setReportPicture(pictureDto.getImageUrl());
                 picture.setSourceFileUrl(pictureDto.getSourceFileUrl());
-                picture.setIsShowApp(dto.getIsShowApp());
+                picture.setIsShowApp(pictureDto.getIsShowApp());
+                picture.setPictureRemark(pictureDto.getPictureRemark());
                 pictureList.add(picture);
             }
             pictureService.saveBatch(pictureList);
@@ -142,6 +145,38 @@ public class MedicalReportServiceImpl extends ServiceImpl<MedicalReportMapper, M
         return true;
     }
 
+    @Override
+    public boolean updateReport(ReportDto dto) {
+        MedicalReport report = this.getById(dto.getId());
+        if (Objects.nonNull(report)){
+            BeanUtil.copyProperties(dto,report);
+            this.updateById(report);
+
+            //处理图片
+            //删除原有的图片
+            pictureService.remove(Wrappers.<MedicalReportPicture>query().eq("medical_report_id",dto.getId()));
+            //新增图片
+            if(null != dto.getPictureList()
+                    && dto.getPictureList().size()>0){
+                ArrayList<MedicalReportPicture> pictureList = new ArrayList<>();
+                for (PictureDto pictureDto:dto.getPictureList()) {
+                    MedicalReportPicture picture = new MedicalReportPicture();
+                    picture.setMedicalReportId(report.getId());
+                    picture.setReportPicture(pictureDto.getImageUrl());
+                    picture.setSourceFileUrl(pictureDto.getSourceFileUrl());
+                    picture.setIsShowApp(pictureDto.getIsShowApp());
+                    picture.setPictureRemark(pictureDto.getPictureRemark());
+                    pictureList.add(picture);
+                }
+                pictureService.saveBatch(pictureList);
+            }
+        }
+
+
+
+        return true;
+    }
+
     @Override
     public MedicalReport myDoctorAsk() {
         //当前用户

src/main/java/com/xwd/hospital/server/service/impl/UserServiceImpl.java

@@ -19,6 +19,7 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import cn.binarywang.wx.miniapp.bean.urllink.GenerateUrlLinkRequest;
 import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.date.DateTime;
@@ -35,6 +36,7 @@ import com.xwd.hospital.server.domain.*;
 import com.xwd.hospital.server.dto.*;
 import com.xwd.hospital.server.enums.*;
 import com.xwd.hospital.server.repository.MedicalReportMapper;
+import com.xwd.hospital.server.rest.res.ApiResponse;
 import com.xwd.hospital.server.rest.thirdPartReq.*;
 import com.xwd.hospital.server.service.*;
 import jakarta.annotation.Resource;
@@ -1002,4 +1004,23 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         caseAndReportCountDto.setReportCount(medicalReportMapper.countByIdNo(userInfo.getIdNo()));
         return caseAndReportCountDto;
     }
+
+    public String getUrlLink() {
+        wxMaService.switchover(doctorAppId);
+        try {
+            GenerateUrlLinkRequest request = new GenerateUrlLinkRequest();
+//            request.setPath();
+//            request.setQuery();
+            String urlLink = wxMaService.getLinkService().generateUrlLink(request);
+
+            log.info("获取到的urlLink {}", urlLink);
+            return urlLink;
+        } catch (WxErrorException e) {
+            log.error(e.getMessage());
+        } finally {
+            //清理ThreadLocal
+            WxMaConfigHolder.remove();
+            return "";
+        }
+    }
 }

src/main/java/com/xwd/hospital/server/vo/MedicalReportPictureVo.java

@@ -12,5 +12,7 @@ public class MedicalReportPictureVo {
 
     public String pictureRemark;
 
+    public String sourceFileUrl;
+
     public Integer isShowApp;
 }

src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: aiming-hospital-server-dev
   datasource:
-    url: jdbc:mysql://172.17.0.16:3306/hospital-server?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+    url: jdbc:mysql://111.229.36.80:3306/hospital-server?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&autoReconnect=true&failOverReadOnly=false&useSSL=false
     username: root
     password: jgx2vgk0p!15
   data:

src/main/resources/mappers/MedicalReportPictureMapper.xml

@@ -41,6 +41,7 @@
         select
             id,
             report_picture,
+            source_file_url,
             picture_remark,
             is_show_app
         from pms_medical_report_picture
@@ -51,6 +52,7 @@
         select
             id,
             report_picture,
+            source_file_url,
             picture_remark,
             is_show_app
         from pms_medical_report_picture