Ver código fonte

新评分-获取病历详情接口修改

songxinlu 3 anos atrás
pai
commit
58bd4629ca

+ 13 - 0
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -342,7 +342,20 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         if (ListUtil.isEmpty(paramList) || paramList.contains("msg")) {
             AnalyzeVO analyzeVO = new AnalyzeVO();
             BeanUtil.copyProperties(getDetailVO, analyzeVO);
+            QcresultInfo qcresultInfo = qcresultInfoFacade.getOne(new QueryWrapper<QcresultInfo>()
+                    .eq("hospital_id", analyzeVO.getHospitalId())
+                    .eq("behospital_code", analyzeVO.getBehospitalCode())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey()));
+            if (qcresultInfo != null && qcresultInfo.getId() != null) {
+                analyzeVO.setQcresultInfoId(qcresultInfo.getId());
+            }
             List<MsgDTO> msgDTOList = getMsg(analyzeVO);
+
+            if (ListUtil.isEmpty(msgDTOList)) {
+                analyzeVO.setQcresultInfoId(null);
+                msgDTOList = getMsg(analyzeVO);
+            }
+
             if (ListUtil.isNotEmpty(msgDTOList)) {
                 // 从qc_question_info的cases_entry_ids获取
                 Map<String, Object> paramMap = new HashMap<>();

+ 2 - 0
src/main/java/com/diagbot/vo/AnalyzeVO.java

@@ -13,6 +13,8 @@ public class AnalyzeVO {
 
     private String behospitalCode; // 病历id
     @ApiModelProperty(hidden = true)
+    private Long qcresultInfoId; // 病历主表id
+    @ApiModelProperty(hidden = true)
     private Long hospitalId; //医院ID
     @ApiModelProperty(hidden = true)
     private Boolean isTask = false;

+ 3 - 0
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -693,6 +693,9 @@
         and a.id = c.cases_entry_id and a.mode_id = b.id
         AND c.cases_id = d.cases_id and c.hospital_id = d.hospital_id
         and c.hospital_id = #{hospitalId}
+        <if test="qcresultInfoId != null">
+            AND c.qcresult_info_id = #{qcresultInfoId}
+        </if>
         and c.behospital_code = #{behospitalCode}
         order by b.order_no, c.grade_type desc, a.order_no) a
         LEFT JOIN sys_user u  on u.id = a.modifier  and u.is_deleted = 'N'