预问诊病历列表和详情修改

prec-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -71,6 +71,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     private TranServiceClient tranServiceClient;
     @Autowired
     private InquiryQuoteFacade inquiryQuoteFacade;
+    @Autowired
+    private SysSetFacade sysSetFacade;
 
     /**
      * 问诊记录保存
@@ -182,13 +184,14 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @return
      */
     public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
-        if (hisInquirysVO.getHospitalId() == null && StringUtil.isBlank(hisInquirysVO.getHospitalCode())) {
+        if (StringUtil.isBlank(hisInquirysVO.getHospitalCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医院信息(医院id或者医院编码)必传！");
         }
 
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        inquiryInfoQe.eq("is_quoted", InquiryQuotedTypeEnum.Disable.getKey());
+        inquiryInfoQe.eq(!sysSetFacade.isQuoteShow(hisInquirysVO.getHospitalCode()),
+                "is_quoted", InquiryQuotedTypeEnum.Disable.getKey());
         inquiryInfoQe.eq(hisInquirysVO.getHospitalId() != null,
                 "hospital_id", hisInquirysVO.getHospitalId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalCode()),
@@ -275,8 +278,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @return
      */
     public GetInquiryDetailDTO getInquiryDetail(GetInquiryDetailVO getInquiryDetailVO) {
-        if (getInquiryDetailVO.getHospitalId() == null
-                && StringUtil.isBlank(getInquiryDetailVO.getHospitalCode())) {
+        if (StringUtil.isBlank(getInquiryDetailVO.getHospitalCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医院信息(医院id或者医院编码)必传！");
         }
         /*if (getInquiryDetailVO.getHospitalDeptId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalDeptCode())) {
@@ -295,7 +297,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
         inquiryInfoQe.eq(getInquiryDetailVO.getInquiryId() != null,
                 "id", getInquiryDetailVO.getInquiryId());
-        inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        inquiryInfoQe.eq(!sysSetFacade.isQuoteShow(getInquiryDetailVO.getHospitalCode()),
+                "is_deleted", IsDeleteEnum.N.getKey());
         inquiryInfoQe.eq("is_quoted", InquiryQuotedTypeEnum.Disable.getKey());
         inquiryInfoQe.eq(getInquiryDetailVO.getHospitalId() != null,
                 "hospital_id", getInquiryDetailVO.getHospitalId());

prec-service/src/main/java/com/diagbot/facade/SysSetFacade.java

@@ -4,6 +4,8 @@ import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysHospitalDTO;
 import com.diagbot.dto.SysSetInfoDTO;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.SysHospitalCodeVO;
@@ -43,4 +45,26 @@ public class SysSetFacade {
         RespDTOUtil.respNGDeal(sysHospitalDTO, "医院编码获取医院信息及科室信息失败！");
         return sysHospitalDTO.data;
     }
+
+    /**
+     * 是否显示引用过的预问诊
+     *
+     * @param hospitalCode
+     * @return
+     */
+    public Boolean isQuoteShow(String hospitalCode) {
+        HospitalSetVO hospitalSetVO = new HospitalSetVO();
+        hospitalSetVO.setHospitalCode(hospitalCode);
+        hospitalSetVO.setCode("quote_show");
+
+        RespDTO<List<SysSetInfoDTO>> retData = tranServiceClient.getSysSetInfoDatas(hospitalSetVO);
+        RespDTOUtil.respNGDeal(retData, "获取配置数据失败！");
+
+        if (retData.data.size() != 1) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "获取配置数据失败！");
+        }
+
+        return retData.data.get(0).getValue().equals("1");
+    }
+
 }