Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -68,7 +68,7 @@ public class RetrievalFacade {
      */
     public RetrievalDTO index(RetrievalVO retrievalVO) {
         RetrievalDTO retrievalDTO = new RetrievalDTO();
-
+        retrievalVO.setInputStr(retrievalVO.getInputStr().trim().toUpperCase());
         switch (retrievalVO.getType()) {
             case 1:
                 retrievalDTO.setLisNames(getLisPacks(retrievalVO.getInputStr()));
@@ -202,7 +202,7 @@ public class RetrievalFacade {
      */
     public List<StaticKnowledgeIndexDTO> staticKnowledgeIndex(StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
         List<StaticKnowledgeIndexDTO> retList = Lists.newLinkedList();
-        String inputStr = staticKnowledgeIndexVO.getInputStr();
+        String inputStr = staticKnowledgeIndexVO.getInputStr().trim().toUpperCase();
         List<Integer> types = staticKnowledgeIndexVO.getTypes();
 
         //TODO 诊断