Merge branch 'develop' of http://223.93.170.82:10080/gaodm/diagbotcloud into his/shaoyifu

# Conflicts:
#	config-server/src/main/resources/shared/icss-service-local.yml
#	config-server/src/main/resources/shared/tran-service-local.yml
#	icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java
#	tran-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java
#	tran-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java
#	tran-service/src/main/java/com/diagbot/web/InquiryInfoController.java
#	tran-service/src/main/java/com/diagbot/web/PatientInfoController.java

tran-service/pom.xml

@@ -67,16 +67,7 @@
             <artifactId>jackson-mapper-asl</artifactId>
             <version>1.9.13</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-jaxb-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
+
         <dependency>
             <groupId>com.diagbot</groupId>
             <artifactId>common</artifactId>

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

@@ -1,21 +1,9 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.diagbot.dto.HisInquirysForDjDTO;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.HisInquirysForDjVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.GetExportInquirysDTO;
+import com.diagbot.dto.HisInquirysForDjDTO;
 import com.diagbot.dto.HisInquirysForJzDTO;
 import com.diagbot.dto.HisInquirysForJzDetailDTO;
 import com.diagbot.entity.InquiryDetail;
@@ -30,7 +18,9 @@ import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.AddDiagnoseSecondVO;
+import com.diagbot.vo.HisInquirysForDjVO;
 import com.diagbot.vo.HisInquirysForJzVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
 import com.google.common.collect.Lists;

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

@@ -28,13 +28,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.rmi.RemoteException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

tran-service/src/main/java/com/diagbot/shaoyifu/util/JsonMapper.java

@@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.util.JSONPObject;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,10 +17,6 @@ public class JsonMapper {
     private static Logger logger = LoggerFactory.getLogger(JsonMapper.class);
     private ObjectMapper mapper;
 
-    public JsonMapper() {
-        this((JsonInclude.Include)null);
-    }
-
     public JsonMapper(JsonInclude.Include include) {
         this.mapper = new ObjectMapper();
         if (include != null) {
@@ -61,49 +56,6 @@ public class JsonMapper {
         }
     }
 
-    public <T> T fromJson(String jsonString, JavaType javaType) {
-        if (StringUtils.isEmpty(jsonString)) {
-            return null;
-        } else {
-            try {
-                return this.mapper.readValue(jsonString, javaType);
-            } catch (IOException var4) {
-                logger.warn("parse json string error:" + jsonString, var4);
-                return null;
-            }
-        }
-    }
-
-    public JavaType createCollectionType(Class<?> collectionClass, Class... elementClasses) {
-        return this.mapper.getTypeFactory().constructParametricType(collectionClass, elementClasses);
-    }
-
-    public <T> T update(String jsonString, T object) {
-        try {
-            return this.mapper.readerForUpdating(object).readValue(jsonString);
-        } catch (JsonProcessingException var4) {
-            logger.warn("update json string:" + jsonString + " to object:" + object + " error.", var4);
-        } catch (IOException var5) {
-            logger.warn("update json string:" + jsonString + " to object:" + object + " error.", var5);
-        }
-
-        return null;
-    }
-
-    public String toJsonP(String functionName, Object object) {
-        return this.toJson(new JSONPObject(functionName, object));
-    }
-
-    public void enableEnumUseToString() {
-        this.mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-        this.mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
-    }
-
-    public void enableJaxbAnnotation() {
-        JaxbAnnotationModule module = new JaxbAnnotationModule();
-        this.mapper.registerModule(module);
-    }
-
     public ObjectMapper getMapper() {
         return this.mapper;
     }

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

@@ -14,21 +14,6 @@ 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;
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.GetExportInquirysDTO;
-import com.diagbot.dto.HisInquirysForJzDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.InquiryInfoFacade;
-import com.diagbot.vo.AddDiagnoseSecondVO;
-import com.diagbot.vo.HisInquirysForJzVO;
-import com.diagbot.vo.SaveInquiryToHisVO;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-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;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.text.SimpleDateFormat;
@@ -36,8 +21,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-import java.util.List;
-
 /**
  * <p>
  * 对接层问诊信息控制器

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

@@ -1,16 +1,5 @@
 package com.diagbot.web;
 
-import java.rmi.RemoteException;
-import java.text.ParseException;
-import java.util.List;
-import java.util.Map;
-import javax.validation.Valid;
-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;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
@@ -31,6 +20,8 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.rmi.RemoteException;
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;