对接

aipt-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -1,24 +1,23 @@
 package com.diagbot.client;
 
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
-import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
+import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.IndexDataiIds;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 调用信息对接层服务
@@ -44,7 +43,7 @@ public interface TranServiceClient {
      */
     @PostMapping("/diseaseIcd/getDiseaseIcds")
     RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcds(@RequestBody GetDiseaseIcdVO getDiseaseIcdVO);
-    
+
     /**
      * 获取页面顶部病人医生科室信息
      *
@@ -102,10 +101,11 @@ public interface TranServiceClient {
     /**
      * 数据服务模式是否对外对接
      *
+     * @param hosCodeVO
      * @return
      */
-    @PostMapping("/dataService/isDocking")
-    RespDTO<Boolean> isDocking();
+    @PostMapping("/dataService/isConnect")
+    RespDTO<Boolean> isConnect(HosCodeVO hosCodeVO);
 
     /**
      * 根据医院编码获取化验公表映射关系，公表项做key
@@ -125,19 +125,21 @@ public interface TranServiceClient {
     @PostMapping("/pacsConfig/getPacsConfigByUniqueNameAndHosCode")
     RespDTO<Map<String, List<String>>> getPacsConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO);
 
-	/**
-	 * 指标数据获取
-	 * @param indexDataFindVO
-	 * @return
-	 */
-	@PostMapping(value = "/indexData/getIndexDatas")
-	RespDTO<List<IndexDataDTO>> getIndexDatas(@RequestBody IndexDataiIds indexDataFindVO);
+    /**
+     * 指标数据获取
+     *
+     * @param indexDataFindVO
+     * @return
+     */
+    @PostMapping(value = "/indexData/getIndexDatas")
+    RespDTO<List<IndexDataDTO>> getIndexDatas(@RequestBody IndexDataiIds indexDataFindVO);
 
-	/**
-	 * 指标数据保存
-	 * @param indexDataSaveVO
-	 * @return
-	 */
-	@PostMapping(value = "/indexData/saveIndexDatas")
-	RespDTO<Boolean> saveIndexDatas(@RequestBody IndexDataSaveVO indexDataSaveVO);
+    /**
+     * 指标数据保存
+     *
+     * @param indexDataSaveVO
+     * @return
+     */
+    @PostMapping(value = "/indexData/saveIndexDatas")
+    RespDTO<Boolean> saveIndexDatas(@RequestBody IndexDataSaveVO indexDataSaveVO);
 }

aipt-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -42,7 +42,7 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getDiseaseIcds");
         return null;
     }
-    
+
     @Override
     public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(GetTopPatientInfoVO getTopPatientInfoVO) {
         log.error("【hystrix】调用{}异常", "getTopPatientInfo");
@@ -112,11 +112,12 @@ public class TranServiceHystrix implements TranServiceClient {
     /**
      * 数据服务模式是否对外对接
      *
+     * @param hosCodeVO
      * @return
      */
     @Override
-    public RespDTO<Boolean> isDocking() {
-        log.error("【hystrix】调用{}异常", "isDocking");
+    public RespDTO<Boolean> isConnect(HosCodeVO hosCodeVO) {
+        log.error("【hystrix】调用{}异常", "isConnect");
         return null;
     }
 
@@ -144,16 +145,15 @@ public class TranServiceHystrix implements TranServiceClient {
         return null;
     }
 
-	@Override
-	public RespDTO<List<IndexDataDTO>> getIndexDatas(@Valid IndexDataiIds indexDataFindVO) {
-		log.error("【hystrix】调用{}异常", "getIndexDatas");
-		return null;
-	}
-
-	@Override
-	public RespDTO<Boolean> saveIndexDatas(@Valid IndexDataSaveVO indexDataSaveVO) {
-		log.error("【hystrix】调用{}异常", "saveIndexDatas");
-		return null;
-	}
+    @Override
+    public RespDTO<List<IndexDataDTO>> getIndexDatas(@Valid IndexDataiIds indexDataFindVO) {
+        log.error("【hystrix】调用{}异常", "getIndexDatas");
+        return null;
+    }
 
+    @Override
+    public RespDTO<Boolean> saveIndexDatas(@Valid IndexDataSaveVO indexDataSaveVO) {
+        log.error("【hystrix】调用{}异常", "saveIndexDatas");
+        return null;
+    }
 }

aipt-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -64,18 +64,18 @@ public class PushFacade {
     public PushDTO pushInner(SearchVo searchVo) {
         PushDTO pushDTO = new PushDTO();
         //是否对接
-        RespDTO<Boolean> dockingRes = tranServiceClient.isDocking();
-        Boolean isDocking = false;
-        if (RespDTOUtil.respIsOK(dockingRes)) {
-            isDocking = dockingRes.data;
-            if (isDocking) {
-                if (StringUtil.isBlank(searchVo.getHosCode())) {
-                    throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入医院编码");
-                }
+        Boolean isConnect = false;
+        if (StringUtil.isNotBlank(searchVo.getHosCode())) {
+            HosCodeVO hosCodeVO = new HosCodeVO();
+            hosCodeVO.setHosCode(searchVo.getHosCode());
+            RespDTO<Boolean> connectRes = tranServiceClient.isConnect(hosCodeVO);
+            if (RespDTOUtil.respIsOK(connectRes)) {
+                isConnect = connectRes.data;
             }
         }
+
         //化验转公表项处理
-        if (isDocking) {
+        if (isConnect) {
             List<LisResult> lisArr = searchVo.getLisArr();
             lisArr = addUniqueName(lisArr, searchVo.getHosCode());
             searchVo.setLisArr(lisArr);
@@ -118,7 +118,7 @@ public class PushFacade {
                 List<String> nameList = lis.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
                     List<ConceptPushDTO> lisDTO = getConceptDTOList(nameList, LexiconTypeEnum.LIS_TABLES.getKey());
-                    if (isDocking) {
+                    if (isConnect) {
                         lisDTO = addClientName(lisDTO, searchVo.getHosCode(), ConceptTypeEnum.Lis.getKey());
                     }
                     pushDTO.setLab(lisDTO);
@@ -132,7 +132,7 @@ public class PushFacade {
                 List<String> nameList = pacs.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
                     List<ConceptPushDTO> pacsDTO = getConceptDTOList(nameList, LexiconTypeEnum.PACS_ITEMS.getKey());
-                    if (isDocking) {
+                    if (isConnect) {
                         pacsDTO = addClientName(pacsDTO, searchVo.getHosCode(), ConceptTypeEnum.Pacs.getKey());
                     }
                     pushDTO.setPacs(pacsDTO);
@@ -162,7 +162,7 @@ public class PushFacade {
                         }
                         if (ListUtil.isNotEmpty(hrNameList)) {
                             List<ConceptPushDTO> hrDisDTO = getConceptDTOList(hrNameList, LexiconTypeEnum.DIAGNOSIS.getKey());
-                            if (isDocking) {
+                            if (isConnect) {
                                 hrDisDTO = addClientName(hrDisDTO, searchVo.getHosCode(), ConceptTypeEnum.Disease.getKey());
                             }
                             disMapDTO.put("警惕", hrDisDTO);
@@ -188,7 +188,7 @@ public class PushFacade {
                     List<String> nameListByDisClass = entry.getValue().stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
                     if (ListUtil.isNotEmpty(nameListByDisClass)) {
                         List<ConceptPushDTO> disDTO = getConceptDTOList(nameListByDisClass, LexiconTypeEnum.DIAGNOSIS.getKey());
-                        if (isDocking) {
+                        if (isConnect) {
                             disDTO = addClientName(disDTO, searchVo.getHosCode(), ConceptTypeEnum.Disease.getKey());
                         }
                         disMapDTO.put(entry.getKey(), disDTO);

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -28,6 +28,7 @@ public class SearchVo {
     private String past;
     private String other;
     private String vital;
+    @ApiModelProperty(hidden = true)
     private String lis;
     private List<LisResult> lisArr;
     private String pacs;

icss-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -160,14 +160,6 @@ public interface TranServiceClient {
     @PostMapping("/diseaseIcd/getDiseaseIcdByHosCode")
     RespDTO<Map<String, String>> getDiseaseIcdByHosCode(@RequestBody HosCodeVO hosCodeVO);
 
-    /**
-     * 数据服务模式是否对外对接
-     *
-     * @return
-     */
-    @PostMapping("/dataService/isDocking")
-    RespDTO<Boolean> isDocking();
-
     /**
      * 根据医院编码获取化验公表映射关系，公表项做key
      *

icss-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -157,17 +157,6 @@ public class TranServiceHystrix implements TranServiceClient {
         return null;
     }
 
-    /**
-     * 数据服务模式是否对外对接
-     *
-     * @return
-     */
-    @Override
-    public RespDTO<Boolean> isDocking() {
-        log.error("【hystrix】调用{}异常", "isDocking");
-        return null;
-    }
-
     /**
      * 根据医院编码获取化验公表映射关系，公表项做key
      *

tran-service/src/main/java/com/diagbot/entity/HospitalInfo.java

@@ -86,6 +86,11 @@ public class HospitalInfo implements Serializable {
      */
     private String remark;
 
+    /**
+     * 是否对接（0-不对接，1-对接）
+     */
+    private Integer connect;
+
     public Long getId() {
         return id;
     }
@@ -93,6 +98,7 @@ public class HospitalInfo implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -100,6 +106,7 @@ public class HospitalInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -107,6 +114,7 @@ public class HospitalInfo implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -114,6 +122,7 @@ public class HospitalInfo implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -121,6 +130,7 @@ public class HospitalInfo implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -128,6 +138,7 @@ public class HospitalInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public String getCode() {
         return code;
     }
@@ -135,6 +146,7 @@ public class HospitalInfo implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+
     public String getName() {
         return name;
     }
@@ -142,6 +154,7 @@ public class HospitalInfo implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
     public String getAddress() {
         return address;
     }
@@ -149,6 +162,7 @@ public class HospitalInfo implements Serializable {
     public void setAddress(String address) {
         this.address = address;
     }
+
     public String getSpell() {
         return spell;
     }
@@ -156,6 +170,7 @@ public class HospitalInfo implements Serializable {
     public void setSpell(String spell) {
         this.spell = spell;
     }
+
     public Integer getStatus() {
         return status;
     }
@@ -163,6 +178,7 @@ public class HospitalInfo implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
     public Integer getOrderNo() {
         return orderNo;
     }
@@ -170,6 +186,7 @@ public class HospitalInfo implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -178,22 +195,31 @@ public class HospitalInfo implements Serializable {
         this.remark = remark;
     }
 
+    public Integer getConnect() {
+        return connect;
+    }
+
+    public void setConnect(Integer connect) {
+        this.connect = connect;
+    }
+
     @Override
     public String toString() {
         return "HospitalInfo{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", code=" + code +
-        ", name=" + name +
-        ", address=" + address +
-        ", spell=" + spell +
-        ", status=" + status +
-        ", orderNo=" + orderNo +
-        ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", code=" + code +
+                ", name=" + name +
+                ", address=" + address +
+                ", spell=" + spell +
+                ", status=" + status +
+                ", orderNo=" + orderNo +
+                ", remark=" + remark +
+                ", connect=" + connect +
+                "}";
     }
 }

tran-service/src/main/java/com/diagbot/facade/DataServiceFacade.java

@@ -0,0 +1,48 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.HospitalInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.HosCodeVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.management.Query;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/20 13:09
+ */
+@Component
+public class DataServiceFacade {
+    @Autowired
+    HospitalInfoFacade hospitalInfoFacade;
+
+    /**
+     * 对接
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    public Boolean isConnect(HosCodeVO hosCodeVO) {
+        if (StringUtil.isBlank(hosCodeVO.getHosCode())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入医院编码");
+        }
+        QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("code", hosCodeVO.getHosCode());
+        HospitalInfo hospitalInfo = hospitalInfoFacade.getOne(queryWrapper);
+        if (hospitalInfo == null) {
+            return false;
+        } else {
+            if (hospitalInfo.getConnect().equals(1)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+}

tran-service/src/main/java/com/diagbot/web/DataServiceController.java

@@ -2,9 +2,14 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DataServiceFacade;
+import com.diagbot.vo.HosCodeVO;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -18,10 +23,14 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "数据服务对外接口相关API", tags = { "数据服务对外接口相关API" })
 public class DataServiceController {
 
+    @Autowired
+    DataServiceFacade dataServiceFacade;
+
     @ApiOperation(value = "是否对接:[by:zhaops]")
-    @PostMapping("/isDocking")
-    @SysLogger("isDocking")
-    public RespDTO<Boolean> isDocking() {
-        return RespDTO.onSuc(false);
+    @PostMapping("/isConnect")
+    @SysLogger("isConnect")
+    public RespDTO<Boolean> isConnect(@RequestBody HosCodeVO hosCodeVO) {
+        Boolean data = dataServiceFacade.isConnect(hosCodeVO);
+        return RespDTO.onSuc(data);
     }
-}
+}