Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

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

@@ -73,12 +73,12 @@ public class ClinicalFacade {
      */
     public ResponseData processClinicalData(@RequestBody SearchVo searchVo) {
         SearchVo sData = searchVo;
-        Map<String, List<Map<String, String>>> standWord = getStandWord();
-        //        standWordObj = getStandWord();
-        Response<List<Lexeme>> resp = nlpServiceClient.split(sData.getSymptom());
-        if (null != resp && null != resp.getData()) {
-            addStandWord(resp.getData(), standWord, sData);
-        }
+//        Map<String, List<Map<String, String>>> standWord = getStandWord();
+//        //        standWordObj = getStandWord();
+//        Response<List<Lexeme>> resp = nlpServiceClient.split(sData.getSymptom());
+//        if (null != resp && null != resp.getData()) {
+//            addStandWord(resp.getData(), standWord, sData);
+//        }
 
         sData.setLisArr(processLis(sData.getLisArr()));
 

icssman-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -14,6 +14,7 @@ import com.diagbot.service.LisMappingService;
 import com.diagbot.service.impl.LisMappingServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.IdListVO;
 import com.diagbot.vo.IdVO;
@@ -104,8 +105,12 @@ public class LisMappingFacade extends LisMappingServiceImpl {
     public Boolean hasLisMapping(LisMappingVO lisMappingVO) {
         QueryWrapper<LisMapping> lisMappingQueryWrapper = new QueryWrapper<>();
         lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("meal_name", lisMappingVO.getMealName())
-                .eq("item_name", lisMappingVO.getItemName());
+                .eq("meal_name", lisMappingVO.getMealName());
+        if (StringUtil.isBlank(lisMappingVO.getItemName())) {
+            lisMappingQueryWrapper.and(i -> i.isNull("item_name").or(j -> j.eq("item_name", "")));
+        } else {
+            lisMappingQueryWrapper.eq("item_name", lisMappingVO.getItemName());
+        }
         List<LisMapping> lisMappingList = this.list(lisMappingQueryWrapper);
         if (ListUtil.isNotEmpty(lisMappingList)) {
             return true;

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -243,6 +243,7 @@ public class ConceptFacade extends ConceptServiceImpl {
     	conceptQe.like(StringUtil.isNotBlank(getAllInformationVO.getName()),"lib_name", getAllInformationVO.getName());
     	conceptQe.eq(StringUtil.isNotBlank(getAllInformationVO.getType()),"lib_type", LexiconTypeEnum.getKey(getAllInformationVO.getType()));
     	conceptQe.eq(StringUtil.isNotBlank(getAllInformationVO.getIsDeleted()),"is_deleted", getAllInformationVO.getIsDeleted());
+    	conceptQe.orderByAsc("is_deleted");
     	conceptQe.orderByDesc("gmt_modified");
     	IPage<Concept> iPage = this.page(conceptPage, conceptQe);
     	BeanUtil.copyProperties(iPage, getAllInformationDTOPage);

knowledgeman-service/src/main/java/com/diagbot/facade/RelationFacade.java

@@ -38,6 +38,8 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.RelationService;
 import com.diagbot.service.impl.RelationServiceImpl;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddRelationInfoVO;
@@ -72,12 +74,10 @@ public class RelationFacade extends RelationServiceImpl {
      */
     public IPage<GetRelationInfoListDTO> getRelationInfoList(GetRelationInfoListVO getRelationInfoListVO) {
     	IPage<GetRelationInfoListDTO> ipage = this.baseMapper.getRelationInfoList(getRelationInfoListVO);
-    	List<String> ids = ipage.getRecords().stream().map(i->i.getOperName()).distinct().collect(Collectors.toList());
-    	if(ids.size()>0){
+    	if(ListUtil.isNotEmpty(ipage.getRecords())){
+    		List<String> ids = ipage.getRecords().stream().map(i->i.getOperName()).distinct().collect(Collectors.toList());
     		RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
-        	if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
-                throw new CommonException(CommonErrorCode.RPC_ERROR,"获取用户信息失败");
-            }
+        	RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
         	ipage.getRecords().forEach(i->{
         		i.setOperName(respDTO.data.get(i.getOperName()));
         	});

knowledgeman-service/src/main/resources/mapper/RelationMapper.xml

@@ -33,7 +33,9 @@
 		FROM kl_relation a 
 		JOIN kl_concept b on a.start_id=b.id
 		JOIN kl_concept c on a.end_id=c.id
-		WHERE a.relation_id NOT IN(17,18)) t
+		WHERE a.relation_id NOT IN(17,18)
+		and b.is_deleted='N'
+		and c.is_deleted='N') t
 		where 1=1 
 		<if test="isDeleted!=null and isDeleted!=''">
 			and isDeleted=#{isDeleted}

tran-service/pom.xml

@@ -154,6 +154,14 @@
             <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
         </dependency>
 
+        <!-- CXF webservice -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+        <!-- CXF webservice -->
+
     </dependencies>
 
     <build>

tran-service/src/main/java/com/diagbot/client/CxfClient.java

@@ -0,0 +1,50 @@
+package com.diagbot.client;
+
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/7/2 10:43
+ */
+public class CxfClient {
+
+    public static void main(String[] args) {
+        cl2();
+    }
+
+    /**
+     * 动态调用方式
+     */
+    public static void cl2() {
+        // 创建动态客户端
+        JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
+        Client client = dcf.createClient("http://116.62.126.198:8089/APP_Webservicesfuzl/service/WebServices?wsdl");
+        // 需要密码的情况需要加上用户名和密码
+        // client.getOutInterceptors().add(new ClientLoginInterceptor(USER_NAME,
+        // PASS_WORD));
+        Object[] objects = new Object[0];
+        try {
+            // invoke("方法名",参数1,参数2,参数3....);
+            String in0  = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
+                    "<ROOT>\n" +
+                    "    <HEAD>\n" +
+                    "        <tranKey>ICSS_GET_PATIENT</tranKey>\n" +
+                    "        <tranType>ICSS_GET_PATIENT</tranType>\n" +
+                    "        <stffNo></stffNo>\n" +
+                    "        <hospitalId></hospitalId>\n" +
+                    "        <departId></departId>\n" +
+                    "        <tranData></tranData>\n" +
+                    "    </HEAD>\n" +
+                    "    <BODY xsi:type=\"patientInfoRequest\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n" +
+                    "        <PATIENTID>1</PATIENTID>\n" +
+                    "    </BODY>\n" +
+                    "</ROOT>\n";
+            objects = client.invoke("ICSS_GET_PATIENT", in0);
+            System.out.println("返回数据:" + objects[0]);
+        } catch (java.lang.Exception e) {
+            e.printStackTrace();
+        }
+    }
+}