修改同步的查询报告单

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java

@@ -41,6 +41,7 @@ public class RmsDto {
         @ApiModelProperty("完成状态 0:未完成 1:完成 2:中止")
         private Byte complateStatus;
         private Byte sex;
+
     }
 
     @ApiModel("导出报告单-VO")
@@ -77,6 +78,10 @@ public class RmsDto {
         @ApiModelProperty("MoCA雷达图路径")
         private String ldt;
 
+
+        @ApiModelProperty("测评医生（userID）")
+        private Long testerId;
+
         private Long deptId;
     }
 

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java

@@ -1294,7 +1294,7 @@ public class RmsVo {
         @ApiModelProperty("身份证号")
         private String idCard;
         @ApiModelProperty("就诊类型 0门诊 1住院")
-        private Byte visitType;
+        private String visitType;
         @ApiModelProperty("就诊号")
         private String visitNo;
         @ApiModelProperty("部门")

ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/AmsReportServiceImpl.java

@@ -24,6 +24,7 @@ import com.ccsens.system.domain.vo.*;
 import com.ccsens.system.persist.mapper.*;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.data.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -40,6 +41,7 @@ import java.util.stream.Collectors;
 import static com.ccsens.common.utils.PropUtil.path;
 import static com.ccsens.common.utils.PropUtil.reportDomain;
 
+@Slf4j
 @Service
 public class AmsReportServiceImpl implements AmsReportService {
 
@@ -441,6 +443,13 @@ public class AmsReportServiceImpl implements AmsReportService {
 
     @Override
     public AmsReportVo.Result exportYs(RmsDto.ExportReport1Dto dto) {
+        Long userId = dto.getTesterId();
+        try {
+            userId = SecurityUtils.getUserId();
+        }catch (Exception e){
+            log.error("获取用户ID失败",e);
+        }
+
         RmsReport report = rmsReportMapper.selectByPrimaryKey(dto.getReportId());
         if (ObjectUtil.isNotNull(report) && StrUtil.isNotBlank(report.getUrl())) {
             AmsReportVo.Result result = new AmsReportVo.Result();
@@ -451,7 +460,7 @@ public class AmsReportServiceImpl implements AmsReportService {
 
         RmsDto.QueryDetail queryDetail = new RmsDto.QueryDetail();
         queryDetail.setEvaluationId(dto.getEvaluationId());
-        RmsVo.ReportDetail detail = rmsService.queryReportDetail(queryDetail, SecurityUtils.getUserId());
+        RmsVo.ReportDetail detail = rmsService.queryReportDetail(queryDetail, userId);
         if (detail == null) {
             return null;
         }
@@ -482,7 +491,7 @@ public class AmsReportServiceImpl implements AmsReportService {
             }
         }else {
             //签名信息
-            Long userId = SecurityUtils.getUserId();
+
             List<HmsVo.QuerySign> querySigns = hmsDoctorDao.querySign(userId);
             if (CollUtil.isNotEmpty(querySigns)) {
                 HmsVo.QuerySign querySign = querySigns.get(0);

ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/RmsServiceImpl.java

@@ -11,7 +11,9 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HtmlUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
+import com.ccsens.admin.persist.dao.HmsDao;
 import com.ccsens.admin.persist.dao.RmsDao;
+import com.ccsens.admin.service.AmsReportService;
 import com.ccsens.admin.service.IAmsCanvasService;
 import com.ccsens.admin.service.IRmsService;
 import com.ccsens.common.config.AppConfig;
@@ -102,7 +104,11 @@ public class RmsServiceImpl implements IRmsService {
     @Resource
     private EmsEvaluationQuestionDurationMapper emsEvaluationQuestionDurationMapper;
     @Resource
+    private AmsReportService amsReportService;
+    @Resource
     private QmsScaleMapper qmsScaleMapper;
+    @Resource
+    private HmsDao hmsDoctorDao;
 
     @Value("${informed.prefixWord}")
     private String prefixWord;
@@ -1703,16 +1709,17 @@ public class RmsServiceImpl implements IRmsService {
         String url = "";
         //根据医生id查找医生的签名id
         if(ObjectUtil.isNotNull(dto.getAssessorId())){
-//            List<HmsVo.QuerySign> querySigns = hmsDoctorDao.querySign(dto.getAssessorId());
-//            if(CollUtil.isNotEmpty(querySigns)){
-//                //生成文件
-//                RmsDto.ExportReport1Dto exportReport1Dto = new RmsDto.ExportReport1Dto();
-//                exportReport1Dto.setReportId(dto.getReportId());
-//                exportReport1Dto.setEvaluationId(dto.getEvaluationId());
-//                exportReport1Dto.setSignId(querySigns.get(0).getSignId());
-//                AmsReportVo.Result result = amsReportService.exportYs(exportReport1Dto);
-//                url = result.getPath();
-//            }
+            List<HmsVo.QuerySign> querySigns = hmsDoctorDao.querySign(dto.getAssessorId());
+            if(CollUtil.isNotEmpty(querySigns)){
+                //生成文件
+                RmsDto.ExportReport1Dto exportReport1Dto = new RmsDto.ExportReport1Dto();
+                exportReport1Dto.setReportId(dto.getReportId());
+                exportReport1Dto.setEvaluationId(dto.getEvaluationId());
+                exportReport1Dto.setSignId(querySigns.get(0).getSignId());
+                exportReport1Dto.setTesterId(dto.getAssessorId());
+                AmsReportVo.Result result = amsReportService.exportYs(exportReport1Dto);
+                url = result.getPath();
+            }
         }
         return url;
     }

ruisi_java/ruisi-web-admin/src/main/resources/application-stage.yml

@@ -98,19 +98,20 @@ ht:
     patientUrl: https://test.tall.wiki/ruisi/client/#
     name: 认知功能评测云平台系统
 file:
-  path: /home/cloud/ht/uploads/
-  #domain: https://api.ccsens.com/test/
-  domain: https://test.tall.wiki/ruisiClient
-  imgDomain: https://test.tall.wiki/htageClient/profile
-  reportPath: /home/ruisiCga/server
   ldTemplate: /home/ruisiCga/server/profile/upload/dTemplate.xlsx
   ldTjbgDir: /home/ruisiCga/server/profile/tjbg/
   ldExportDir: /home/ruisiCga/server/profile/ldExport
   ldZQTYDir: /home/ruisiCga/server/profile/ldZQTYExport
   ldZQTYTemplate: /home/ruisiCga/server/profile/upload/2024年河津流调知情同意书模板-V1.docx
-  grPath: /data/cgav2/server/profile/grReportTemplate.docx
-  ysPath: /data/cgav2/server/profile/ysReportTemplate.docx
-
+  path: D:/Projects/ruisi_cga/server/profile/
+  webPath: https://test.tall.wiki/ruisi/client/#
+  #domain: https://api.ccsens.com/test/
+  domain:  https://test.tall.wiki/ruisiClient
+  imgDomain: https://test.tall.wiki/ruisiClient/profile
+  reportDomain: D:/Projects/ruisi_cga/server/profile
+  reportPath: D:/Projects/ruisi_cga/server/profile
+  grPath: D:/Projects/ruisi_cga/server/profile/grReportTemplate.docx
+  ysPath: D:/Projects/ruisi_cga/server/profile/ysReportTemplate.docx
 
 informed:
   studySign: /home/ruisi/server/profile/studySign.png