推理入参增加既往史字段pasts

aipt-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -29,6 +29,7 @@ public class SearchData {
     private String pacs = "";
     private String diag = "";
     private String past = "";
+    private String pasts = "";
     private String other = "";
     private List<LisResult> lisArr;
     private Integer disType; //0-普通病（默认不填），1-慢病，2-急诊
@@ -64,4 +65,4 @@ public class SearchData {
     private List<Feature> pacsFeatureList = new ArrayList<>();
     private List<Feature> diagFeatureList = new ArrayList<>();
     private List<Feature> symptompropertyFeatureList = new ArrayList<>();
-}
+}

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -26,7 +26,7 @@ public class SearchVo {
     //特征类别
     private String featureType;
     private String symptom;
-    private String past;
+    private String pasts;
     private String other;
     private String vital;
     @ApiModelProperty(hidden = true)

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

@@ -33,6 +33,7 @@ public class PushController {
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，M：男，F：女<br>" +
                     "symptom：症状,String<br>" +
+                    "pasts：既往史,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
                     "lis：化验,Array<br>" +
@@ -72,6 +73,7 @@ public class PushController {
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，M：男，F：女<br>" +
                     "symptom：症状,String<br>" +
+                    "pasts：既往史,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
                     "lis：化验,Array<br>" +

data-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -20,7 +20,7 @@ public class SearchData {
     //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
     private String sysCode;
     private String symptom;
-    private String past;
+    private String pasts;
     private String other;
     private String vital;
     private String lis;

data-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -31,7 +31,7 @@ public class AssembleFacade {
         searchData.setVital(pushVO.getVital());
         searchData.setLis(pushVO.getLisString());
         searchData.setPacs(pushVO.getPacs());
-        searchData.setPast(pushVO.getPast());
+        searchData.setPasts(pushVO.getPasts());
         searchData.setOther(pushVO.getOther());
         searchData.setDiag(pushVO.getDiag());
         searchData.setDisType(pushVO.getDisType());

data-service/src/main/java/com/diagbot/vo/PushBaseVO.java

@@ -28,7 +28,6 @@ public class PushBaseVO {
     private String vital;
     private List<LisResult> lis;
     private String pacs;
-    @ApiModelProperty(hidden = true)
-    private String past;
+    private String pasts;
     private String other;
 }

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

@@ -34,6 +34,7 @@ public class PushController {
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填) 1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
+                    "pasts：既往史,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
                     "lis：化验,Array<br>" +
@@ -69,6 +70,7 @@ public class PushController {
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
+                    "pasts：既往史,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
                     "lis：化验,Array<br>" +
@@ -104,6 +106,7 @@ public class PushController {
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
+                    "pasts：既往史,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
                     "lis：化验,Array<br>" +

icss-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -21,7 +21,7 @@ public class SearchData {
     //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
     private String sysCode;
     private String symptom;
-    private String past;
+    private String pasts;
     private String other;
     private String vital;
     private String lis;
@@ -38,5 +38,10 @@ public class SearchData {
     @ApiModelProperty(hidden = true)
     private Integer sysType;   //系统类型
 
+    private String lisString;  //化验纯文本
+    private String lisOrder;   //当前正在下单化验
+    private String pacsOrder;   //当前正在下单辅检
+    private String otherOrder; //其他
+
     private String ruleType;   //规则类型
 }

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

@@ -34,7 +34,7 @@ public class AssembleFacade {
         searchData.setSymptom(pushVO.getSymptom());
         searchData.setVital(pushVO.getVital());
         searchData.setPacs(pushVO.getPacs());
-        searchData.setPast(pushVO.getPast());
+        searchData.setPasts(pushVO.getPasts());
         searchData.setOther(pushVO.getOther());
         searchData.setDiag(pushVO.getDiag());
         searchData.setDisType(pushVO.getDisType());
@@ -48,6 +48,9 @@ public class AssembleFacade {
         searchData.setLength(10);
         searchData.setSysType(SysTypeEnum.ICSS_SERVICE.getKey());
         searchData.setRuleType(pushVO.getRuleType());
+        searchData.setLisOrder(pushVO.getLisOrder());
+        searchData.setPacsOrder(pushVO.getPacsOrder());
+        searchData.setOtherOrder(pushVO.getOtherOrder());
 
         switch (pushVO.getSex()) {
             case 1:

icss-service/src/main/java/com/diagbot/vo/PushBaseVO.java

@@ -27,7 +27,6 @@ public class PushBaseVO {
     private String vital;
     private List<LisResult> lis;
     private String pacs;
-    @ApiModelProperty(hidden = true)
-    private String past;
+    private String pasts;
     private String other;
 }

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

@@ -40,6 +40,7 @@ public class PushController {
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
+                    "pasts：既往史,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
                     "lis：化验,Array<br>" +
@@ -75,6 +76,7 @@ public class PushController {
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
+                    "pasts：既往史,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
                     "lis：化验,Array<br>" +

ltapi-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -20,7 +20,7 @@ public class SearchData {
     //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
     private String sysCode;
     private String symptom;
-    private String past;
+    private String pasts;
     private String other;
     private String vital;
     private String lis;

ltapi-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -34,7 +34,7 @@ public class AssembleFacade {
         searchData.setVital(pushVO.getVital());
         searchData.setPacs(pushVO.getPacs());
         searchData.setPacsArr(pushVO.getPacsArr());
-        searchData.setPast(pushVO.getPast());
+        searchData.setPasts(pushVO.getPasts());
         searchData.setOther(pushVO.getOther());
         searchData.setDiag(pushVO.getDiag());
         searchData.setDisType(pushVO.getDisType());

ltapi-service/src/main/java/com/diagbot/vo/PushBaseVO.java

@@ -28,7 +28,6 @@ public class PushBaseVO {
     private String vital;
     private List<LisResult> lis;
     private String pacs;
-    @ApiModelProperty(hidden = true)
-    private String past;
+    private String pasts;
     private String other;
 }

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

@@ -35,6 +35,7 @@ public class PushController {
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填) 1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
+                    "pasts：既往史,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
                     "lis：化验,Array<br>" +
@@ -75,6 +76,7 @@ public class PushController {
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
+                    "pasts：既往史,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
                     "lis：化验,Array<br>" +
@@ -114,6 +116,7 @@ public class PushController {
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
+                    "pasts：既往史,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
                     "lis：化验,Array<br>" +

prec-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -17,7 +17,7 @@ public class SearchData {
     //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
     private String sysCode;
     private String symptom;
-    private String past;
+    private String pasts;
     private String other;
     private String vital;
     private String lis;

triage-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -27,7 +27,7 @@ public class SearchData {
     private String lis = "";
     private String pacs = "";
     private String diag = "";
-    private String past = "";
+    private String pasts = "";
     private String other = "";
 
     //特征类别