Merge remote-tracking branch 'origin/dev/triage20200319_shaoyifu' into innerDevelop

config-server/src/main/resources/shared/tran-service-dev.yml

@@ -115,6 +115,6 @@ io.github.lvyahui8.spring:
   thread-number: 12
 
 nalizx:
-  apiUrl: TODO
-  appKey: TODO
-  appSecret: TODO
+  apiUrl: http://ssltest.ngarihealth.com/openapi-feature5/gateway
+  appKey: ngari5e7dd28111dc391a
+  appSecret: 11dc391a123e1002

config-server/src/main/resources/shared/tran-service-local.yml

@@ -115,6 +115,6 @@ io.github.lvyahui8.spring:
   thread-number: 12
 
 nalizx:
-  apiUrl: TODO
-  appKey: TODO
-  appSecret: TODO
+  apiUrl: http://ssltest.ngarihealth.com/openapi-feature5/gateway
+  appKey: ngari5e7dd28111dc391a
+  appSecret: 11dc391a123e1002

config-server/src/main/resources/shared/tran-service-pre.yml

@@ -115,6 +115,6 @@ io.github.lvyahui8.spring:
   thread-number: 12
 
 nalizx:
-  apiUrl: TODO
-  appKey: TODO
-  appSecret: TODO
+  apiUrl: http://ssltest.ngarihealth.com/openapi-feature5/gateway
+  appKey: ngari5e7dd28111dc391a
+  appSecret: 11dc391a123e1002

config-server/src/main/resources/shared/tran-service-pro.yml

@@ -115,6 +115,6 @@ io.github.lvyahui8.spring:
   thread-number: 12
 
 nalizx:
-  apiUrl: TODO
-  appKey: TODO
-  appSecret: TODO
+  apiUrl: http://ssltest.ngarihealth.com/openapi-feature5/gateway
+  appKey: ngari5e7dd28111dc391a
+  appSecret: 11dc391a123e1002

config-server/src/main/resources/shared/tran-service-test.yml

@@ -115,6 +115,6 @@ io.github.lvyahui8.spring:
   thread-number: 12
 
 nalizx:
-  apiUrl: TODO
-  appKey: TODO
-  appSecret: TODO
+  apiUrl: http://ssltest.ngarihealth.com/openapi-feature5/gateway
+  appKey: ngari5e7dd28111dc391a
+  appSecret: 11dc391a123e1002

tran-service/src/main/java/com/diagbot/dto/SaveInquiryTriageDTO.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Map;
+
 /**
  * @Description:
  * @author: wangfeng
@@ -27,4 +29,6 @@ public class SaveInquiryTriageDTO {
 
     private String requestBodys;
 
+    private Map<String,Object> bodyMap;
+
 }

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

@@ -31,6 +31,7 @@ public class DiseaseDeptFacade extends DiseaseDeptServiceImpl {
         QueryWrapper<DiseaseDept> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("status", StatusEnum.Enable.getKey())
+                .eq("hospital_code", diseaseDeptVO.getHospitalCode())
                 .in(ListUtil.isNotEmpty(diseaseDeptVO.getConceptNames()), "concept_dis_name", diseaseDeptVO.getConceptNames());
         List<DiseaseDept> diseaseDeptList = this.list(queryWrapper);
         List<DiseaseDeptDTO> diseaseDeptDTOList = BeanUtil.listCopyTo(diseaseDeptList, DiseaseDeptDTO.class);

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

@@ -10,14 +10,12 @@ import com.diagbot.entity.JSONResponseBean;
 import com.diagbot.entity.Request;
 import com.diagbot.entity.Response;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.InquiryTriageService;
 import com.diagbot.service.impl.InquiryTriageServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.FastJsonUtils;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.HttpUtils;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.HospitalVO;
 import com.diagbot.vo.InquiryTriageMechVO;
@@ -28,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.swing.text.Utilities;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -75,22 +72,20 @@ public class InquiryTriageFacade extends InquiryTriageServiceImpl {
         hospitalVO.setSysType(saveInquiryVO.getSysType());
         // 保存记录表
         optInfoFacade.saveOptOnfo(hospitalVO, "2");
-        //邵逸夫医院 心理测试 对接纳里时，返回url
+        //邵逸夫医院 分诊对接纳里时，返回科室编码
         SaveInquiryTriageDTO saveInquiryDTO = new SaveInquiryTriageDTO();
 
-
         if (saveInquiryVO.getHospitalCode().equals("邵逸夫医院")
                 && saveInquiryVO.getIdType().equals(1)) {
             //去咨询
-            List<String> naliRetList = getUrl(saveInquiryVO);
-            String retUrl = naliRetList.get(0);
-            saveInquiryDTO.setBody(retUrl);
-            saveInquiryDTO.setResponse(naliRetList.get(1));
-            saveInquiryDTO.setRequest(naliRetList.get(2));
-            saveInquiryDTO.setRequestBodys(naliRetList.get(3));
+            List<Object> naliRetList = getUrl(saveInquiryVO);
+            saveInquiryDTO.setBodyMap((Map)naliRetList.get(0));
+            saveInquiryDTO.setResponse(naliRetList.get(1).toString());
+            saveInquiryDTO.setRequest(naliRetList.get(2).toString());
+            saveInquiryDTO.setRequestBodys(naliRetList.get(3).toString());
         }else if(saveInquiryVO.getHospitalCode().equals("邵逸夫医院")
                 && saveInquiryVO.getIdType().equals(2)){
-            //去挂号。
+            //去挂号。2期
             //TODO
         }
         return saveInquiryDTO;
@@ -107,10 +102,10 @@ public class InquiryTriageFacade extends InquiryTriageServiceImpl {
         dataNew = BeanUtil.listCopyTo(data, InquiryTriageDTO.class);
         return dataNew;
     }
-    private List<String> getUrl(SaveInquiryTriageVO saveInquiryVO) {
+    private List<Object> getUrl(SaveInquiryTriageVO saveInquiryVO) {
         //TODO 待定
-        List<String> ret = Lists.newArrayList();
-        String retUrl = null;
+        List<Object> ret = Lists.newArrayList();
+//        Map<String,Object> retUrl = null;
         Request request = null;
         Response response = null;
         try {
@@ -123,11 +118,10 @@ public class InquiryTriageFacade extends InquiryTriageServiceImpl {
             log.info("response：" + FastJsonUtils.getBeanToJson(response));
             if (response.isSuccess()) {
                 JSONResponseBean result = response.getJsonResponseBean();
-                retUrl = result.getBody().toString();
+                ret.add(result.getBody());
             }
         } catch (Exception e) {
         }
-        ret.add(retUrl);
         ret.add(FastJsonUtils.getBeanToJson(response));
         ret.add(FastJsonUtils.getBeanToJson(request));
         ret.add(FastJsonUtils.getBeanToJson(request.getBodys()));
@@ -135,12 +129,9 @@ public class InquiryTriageFacade extends InquiryTriageServiceImpl {
     }
     private Request getltcs(SaveInquiryTriageVO saveInquiryVO) {
         List bodyList = new ArrayList<>();
-
-
-
         Map<String, Object> body = new HashMap<>();
         body.put("disDeptist",saveInquiryVO.getDisDeptist() );
-        //body.put("patName", saveInquiryVO.getPatName());
+        body.put("hospitalCode", saveInquiryVO.getHospitalCode());
         body.put("patAge", saveInquiryVO.getPatAge());
         body.put("patSex", saveInquiryVO.getPatSex());
         body.put("idType", saveInquiryVO.getIdType());
@@ -150,11 +141,9 @@ public class InquiryTriageFacade extends InquiryTriageServiceImpl {
         bodyList.add(body);
 
         //X-Service-Id对应的值
-        String serviceId = "consult.questionRecordService";
+        String serviceId = "consult.diagnoseService";
         //X-Service-Method对应的值
-        String method = "saveQuestionRecord";
+        String method = "findConsultDocByDiagnose";
         return new Request(serviceId, method, bodyList);
     }
-
-
 }

triage-service/src/main/java/com/diagbot/dto/SaveInquiryTriageDTO.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Map;
+
 /**
  * @Description:
  * @author: wangfeng
@@ -27,4 +29,6 @@ public class SaveInquiryTriageDTO {
 
     private String requestBodys;
 
+    private Map<String,Object> bodyMap;
+
 }

triage-service/src/main/java/com/diagbot/facade/AIFacade.java

@@ -341,6 +341,10 @@ public class AIFacade {
                         if (StringUtil.isBlank(syfDiseaseDeptDTO.getDept())) {
                             continue;
                         }
+                        //第二个科室概率小于15%，剔除
+                        if (items.size() == 1 && Double.valueOf(syfDiseaseDeptDTO.getRate()) < 0.15d) {
+                            break;
+                        }
                         items.add(syfDiseaseDeptDTO);
                     }
                 }

triage-service/src/main/java/com/diagbot/web/InquiryTriageController.java

@@ -32,7 +32,7 @@ public class InquiryTriageController {
     @Autowired
     private InquiryTriageFacade inquiryTriageFacade;
 
-    @ApiOperation(value = "分诊记录保存[by:gaodm]")
+    @ApiOperation(value = "分诊记录保存[by:wangfeng]")
     @PostMapping("/saveInquiry")
     @SysLogger("saveInquiry")
     @Transactional