diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/ClientEvaVo.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/ClientEvaVo.java index 186fda6..8701b1b 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/ClientEvaVo.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/ClientEvaVo.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.StrUtil; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -396,4 +397,12 @@ public class ClientEvaVo { return result.toString(); } } + + @Data + public static class CongnitiveQuestion{ + @ApiModelProperty("认知域CODE") + private String constiCode; + @ApiModelProperty("题目CODE") + private List questionList; + } } diff --git a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/ClientEvaDao.java b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/ClientEvaDao.java index 76c19c7..591629d 100644 --- a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/ClientEvaDao.java +++ b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/ClientEvaDao.java @@ -4,6 +4,7 @@ import com.ccsens.system.domain.po.TzbsRmsReportResult; import com.ccsens.system.domain.po.TzbsRmsReportYsjy; import com.ccsens.system.domain.vo.ClientEvaVo; import com.ccsens.system.domain.vo.ReportVo; +import com.ccsens.system.domain.vo.RmsVo; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/RmsDao.java b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/RmsDao.java index 10cccf7..4db73a9 100644 --- a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/RmsDao.java +++ b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/RmsDao.java @@ -51,6 +51,14 @@ public interface RmsDao { @Param("evaluationCode") String evaluationCode, @Param("sex") Byte sex); + /** + * 查询中医体质辨识量表详情 + * @param scaleCode + * @return + */ + List queryZytzbsScaleAnswer(@Param("evaluationId") Long evaluationId, + @Param("scaleCode") String scaleCode, + @Param("sex") Byte sex); List queryQuestionAndScore(@Param("evaluationId") Long evaluationId, @Param("scaleCode") String scaleCode); @@ -100,6 +108,10 @@ public interface RmsDao { List queryReportQuestionAndAnswer(@Param("evaluationId") Long evaluationId, @Param("scaleCode") String scaleCode); + List queryReportQuestionAndAnswer1(@Param("evaluationId") Long evaluationId, + @Param("questionCodeList") List questionCodeList, + @Param("sex") Byte sex); + List queryReportGroupCognitiveAndAnswer(@Param("evaluationId") Long evaluationId, @Param("scaleCode") String scaleCode); diff --git a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/RmsServiceImpl.java b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/RmsServiceImpl.java index 1b33051..3bc5a20 100644 --- a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/RmsServiceImpl.java +++ b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/RmsServiceImpl.java @@ -1555,7 +1555,8 @@ public class RmsServiceImpl implements IRmsService { } // List r = rmsDao.queryReportAnswer(report.getEvaluationId(), dto.getEvaluationCode()); //查询患者性别 - List r = rmsDao.queryReportAnswer1(report.getEvaluationId(), dto.getEvaluationCode(), rmsDao.querySexByEvaluationId(report.getEvaluationId())); + Byte aByte = rmsDao.querySexByEvaluationId(report.getEvaluationId()); + List r = rmsDao.queryReportAnswer1(report.getEvaluationId(), dto.getEvaluationCode(), aByte); //特殊处理ADAS-Cog 14 第27题,数字划销 //前端优先使用otherValueList,如果为空则使用otherValue for (RmsVo.ReportDetailAnswer rda : r) { @@ -1576,6 +1577,13 @@ public class RmsServiceImpl implements IRmsService { .collect(Collectors.toList())); r = CollectionUtil.newArrayList(zbi); } + + //特殊处理中医体质辨识 多对多关系 tzbs_qms_scale_cognitive + if ("TZBS_BZ".equalsIgnoreCase(dto.getEvaluationCode()) || "TZBS_LN".equalsIgnoreCase(dto.getEvaluationCode())) { + //查询量表关联认知域及认知域关联题目信息 + r = rmsDao.queryZytzbsScaleAnswer(report.getEvaluationId(), dto.getEvaluationCode(), aByte); + } + return r; } diff --git a/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/ClientEvaDao.xml b/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/ClientEvaDao.xml index 383cb32..85465e7 100644 --- a/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/ClientEvaDao.xml +++ b/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/ClientEvaDao.xml @@ -109,4 +109,10 @@ ORDER BY res.result_id + + + + + + \ No newline at end of file diff --git a/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/RmsDao.xml b/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/RmsDao.xml index 04d872f..236786f 100644 --- a/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/RmsDao.xml +++ b/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/RmsDao.xml @@ -765,6 +765,35 @@ group by ee.id ORDER BY a.qsort,a.sort + + @@ -1489,6 +1518,31 @@ group by ee.id GROUP BY qq.id ORDER BY qq.sort + + +