Merge branch 'dev/xlcs20200305_待定' into dev/xlcs20200224_init

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

@@ -73,6 +73,9 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     @Autowired
     private VisibleIdCreater visibleIdCreater;
 
+    @Autowired
+    private SysSetFacade sysSetFacade;
+
     @Value("${nali.apiUrl}")
     private String apiUrl;
     @Value("${nali.appKey}")
@@ -102,15 +105,17 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
                 && StringUtil.isNotBlank(saveInquiryVO.getPatName())
                 && !IntegerUtil.isNull(saveInquiryVO.getIdType())
                 && StringUtil.isNotBlank(saveInquiryVO.getIdNum())) {
-            String dateStr = DateUtil.formatDate(now);
-            inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_code", saveInquiryVO.getHospitalCode())
-                    .eq("pat_name", saveInquiryVO.getPatName())
-                    .eq("id_type", saveInquiryVO.getIdType())
-                    .eq("id_num", saveInquiryVO.getIdNum())
-                    .apply("date_format(gmt_modified, '%Y-%m-%d')={0}", dateStr), false
-            );
+            if (sysSetFacade.isCover(saveInquiryVO.getHospitalCode())){
+                String dateStr = DateUtil.formatDate(now);
+                inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("hospital_code", saveInquiryVO.getHospitalCode())
+                        .eq("pat_name", saveInquiryVO.getPatName())
+                        .eq("id_type", saveInquiryVO.getIdType())
+                        .eq("id_num", saveInquiryVO.getIdNum())
+                        .apply("date_format(gmt_modified, '%Y-%m-%d')={0}", dateStr), false
+                );
+            }
         }
 
         if (inquiryInfo == null) {

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

@@ -11,6 +11,7 @@ import com.diagbot.service.impl.SysSetServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.StringUtil;
+import com.diagbot.vo.HospSetVO;
 import com.diagbot.vo.SysSetVO;
 import org.springframework.stereotype.Component;
 
@@ -27,25 +28,25 @@ import java.util.stream.Collectors;
  */
 @Component
 public class SysSetFacade extends SysSetServiceImpl {
-    public List<SysSetDTO> getSysSet(SysSetVO sysSetVO){
-        if (null != sysSetVO && StringUtil.isBlank(sysSetVO.getHospitalCode())){
+    public List<SysSetDTO> getSysSet(SysSetVO sysSetVO) {
+        if (null != sysSetVO && StringUtil.isBlank(sysSetVO.getHospitalCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医院编码不能为空！");
         }
         QueryWrapper<SysSet> sysSetQueryWrapper = new QueryWrapper<>();
         sysSetQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_code",sysSetVO.getHospitalCode());
+                .eq("hospital_code", sysSetVO.getHospitalCode());
         List<SysSet> sysSetList = this.list(sysSetQueryWrapper);
         List<SysSetDTO> res = BeanUtil.listCopyTo(sysSetList, SysSetDTO.class);
         return res;
     }
 
 
-    public List<SysSetProHosResDTO> getPositon(){
+    public List<SysSetProHosResDTO> getPositon() {
         List<SysSetProHosResDTO> res = new ArrayList<>();
         QueryWrapper<SysSet> sysSetQueryWrapper = new QueryWrapper<>();
         sysSetQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("code","imgUrl")
-                .ne("province","")
+                .eq("code", "imgUrl")
+                .ne("province", "")
                 .orderByAsc("province");
         List<SysSet> sysSetList = this.list(sysSetQueryWrapper);
         Map<String, List<SysSet>> map = EntityUtil.makeEntityListMap(sysSetList, "province");
@@ -58,4 +59,28 @@ public class SysSetFacade extends SysSetServiceImpl {
         }
         return res;
     }
+
+    public SysSet getHospSet(HospSetVO hospSetVO) {
+        QueryWrapper<SysSet> sysSetQueryWrapper = new QueryWrapper<>();
+        sysSetQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("code", hospSetVO.getCode())
+                .eq("hospital_code", hospSetVO.getHospitalCode());
+        SysSet sysSet = this.getOne(sysSetQueryWrapper, false);
+        return sysSet;
+    }
+
+    public Boolean isCover(String hospitalCode) {
+        HospSetVO hospSetVO = new HospSetVO();
+        hospSetVO.setCode("isCover");
+        hospSetVO.setHospitalCode(hospitalCode);
+        SysSet sysSet = getHospSet(hospSetVO);
+        if (null == sysSet) {
+            return false;
+        } else {
+            if ("1".equals(sysSet.getValue())) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

xlcs-service/src/main/java/com/diagbot/vo/HospSetVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/3/5 10:51
+ */
+@Getter
+@Setter
+public class HospSetVO {
+    //医院编码
+    private String hospitalCode;
+
+    //配置编码
+    private String code;
+}