Merge branch 'master' into innerDevelop

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

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.diagbot.client.MrqcClient;
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.util.CoreUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.AnalyzeCdsVO;
 import com.diagbot.vo.AnalyzeRunVO;
@@ -30,6 +31,7 @@ public class MrqcFacade {
     }
 
     public Map<String, String> caseWritingPrompt(AnalyzeCdsVO analyzeCdsVO) {
+        analyzeCdsVO.setAgeNum(CoreUtil.convertAge(analyzeCdsVO.getAge()));
         RespDTO<Map<String, String>> caseWritingDTO = mrqcClient.caseWritingPrompt(analyzeCdsVO);
         RespDTOUtil.respNGDealCover(caseWritingDTO, "远程调用病历质控接口失败");
         return caseWritingDTO.data;

src/main/java/com/diagbot/vo/RetrievalVO.java

@@ -19,12 +19,12 @@ public class RetrievalVO {
      * 检索内容
      */
     private String inputStr;
-    /**
-     * 性别：1-男、2-女、3-通用
-     */
-    private Integer sex;
-    /**
-     * 年龄
-     */
-    private Integer age;
+//    /**
+//     * 性别：1-男、2-女、3-通用
+//     */
+//    private Integer sex;
+//    /**
+//     * 年龄
+//     */
+//    private Integer age;
 }