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

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -29,8 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -68,6 +68,7 @@ public class PushFacade {
         searchData.setPacs(pushVO.getPacs());
         searchData.setPast(pushVO.getPast());
         searchData.setOther(pushVO.getOther());
+        searchData.setDiag(pushVO.getDiag());
         switch (pushVO.getSex()) {
             case 1:
                 searchData.setSex("M");
@@ -75,11 +76,9 @@ public class PushFacade {
             case 2:
                 searchData.setSex("F");
                 break;
-            case 3:
+            default:
                 searchData.setSex("A");
                 break;
-            default:
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "性别参数错误");
         }
 
         searchData.setFeatureType(pushVO.getFeatureType());
@@ -110,7 +109,7 @@ public class PushFacade {
         List<FeatureRate> labs = data.getLabs();
 
         Map<String, Object> symptomMap = list2Map(symptom);
-        Map<String, Object> vitalMap = new HashMap<>();
+        Map<String, Object> vitalMap = new LinkedHashMap<>();
         Map<String, Object> disMap = list2Map(dis);
         Map<String, Object> labMap = list2Map(labs);
         Map<String, Object> pacsMap = list2Map(pacs);
@@ -168,7 +167,7 @@ public class PushFacade {
                         in("question_id", deptVitalMap.keySet()).
                         orderByAsc("order_no");
                 List<VitalOrder> vitalOrderList = vitalOrderFacade.list(vitalOrderQueryWrapper);
-                Map<Long, VitalOrder> vitalOrderMap = EntityUtil.makeEntityMap(vitalOrderList, "question_id");
+                Map<Long, VitalOrder> vitalOrderMap = EntityUtil.makeEntityMap(vitalOrderList, "questionId");
                 //标签列表
                 for (Map.Entry<Long, VitalOrder> entry : vitalOrderMap.entrySet()) {
                     QuestionVO questionVO = new QuestionVO();
@@ -243,7 +242,7 @@ public class PushFacade {
      * @return
      */
     public Map<String, Object> list2Map(List<FeatureRate> list) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new LinkedHashMap<>();
         for (FeatureRate featureRate : list) {
             map.put(featureRate.getFeatureName(), null);
         }

icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -32,18 +32,32 @@ public class PushController {
     @Autowired
     PushFacade pushFacade;
 
-    @ApiOperation(value = "推理接口[by:zhaops]",
+    @ApiOperation(value = "推理接口(半结构化)[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
-                    "sex：性别，1：男，2：女(必填)<br>")
+                    "sex：性别，1：男，2：女(必填)<br>" +
+                    "symptom：症状<br>" +
+                    "other：其它史<br>" +
+                    "vital：查体<br>" +
+                    "lis：化验<br>" +
+                    "pacs：辅检<br>" +
+                    "dis：诊断<br>" +
+                    "featureType：类型，1：症状，4：查体，5：化验，6：辅检，7：诊断(必填)<br>")
     @PostMapping("/pushInner")
     @SysLogger("pushInner")
     public RespDTO<PushDTO> pushInner(@RequestBody @Valid PushVO pushVO) {
         return RespDTO.onSuc(pushFacade.pushInner(pushVO));
     }
 
-    @ApiOperation(value = "推理接口(直接返回大数据推理结果）[by:zhaops]",
+    @ApiOperation(value = "推理接口(纯文本）[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
-                    "sex：性别，1：男，2：女(必填)<br>")
+                    "sex：性别，1：男，2：女(必填)<br>" +
+                    "symptom：症状<br>" +
+                    "other：其它史<br>" +
+                    "vital：查体<br>" +
+                    "lis：化验<br>" +
+                    "pacs：辅检<br>" +
+                    "dis：诊断<br>" +
+                    "featureType：类型，1：症状，4：查体，5：化验，6：辅检，7：诊断(必填)<br>")
     @PostMapping("/pushAI")
     @SysLogger("pushAI")
     public RespDTO<ResponseData> pushAI(@RequestBody @Valid PushVO pushVO) {