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

aipt-service/src/main/java/com/diagbot/aggregate/PushItemAggregate.java

@@ -59,6 +59,7 @@ public class PushItemAggregate {
 
     @DataProvider("setAll")
     public PushDTO setAll(
+            @InvokeParameter("pushDTO") PushDTO pushDTO,
             @DataConsumer("getDept") ConceptPushDTO dept,
             @DataConsumer("setSymptom") List<ConceptPushDTO> symptom,
             @DataConsumer("setVital") List<ConceptPushDTO> vital,
@@ -66,7 +67,9 @@ public class PushItemAggregate {
             @DataConsumer("setRetPacs") List<ConceptPushDTO> pacs,
             @DataConsumer("setDis") Map<String, List<ConceptPushDTO>> dis,
             @DataConsumer("setMedicalIndications") List<MedicalIndication> medicalIndications) {
-        PushDTO pushDTO = new PushDTO();
+        if (pushDTO == null) {
+            pushDTO = new PushDTO();
+        }
         if (null != dept) {
             pushDTO.setDept(dept);
         }

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

@@ -60,6 +60,7 @@ public class PushFacade {
 
         try {
             Map<String, Object> invokeParams = new HashMap<>();
+            invokeParams.put("pushDTO", pushDTO);
             invokeParams.put("featureTypeSet", featureTypeSet);
             invokeParams.put("data", data);
             invokeParams.put("isConnect", isConnect);

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

@@ -46,6 +46,8 @@ public class PushFacade {
         String[] featureTypes = featureType.split(",|，");
         Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
 
+        pushDTO.setHasIndications(data.getHasIndications());
+
         //症状
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Symptom.getKey()))) {
             List<ConceptPushDTO> symptom = data.getSymptom();

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

@@ -62,6 +62,7 @@ public class PushFacade {
 
         //推理结果返回科室
         pushDTO.setDept(data.getDept());
+        pushDTO.setHasIndications(data.getHasIndications());
 
         try {
             Map<String, Object> invokeParams = new HashMap<>();

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

@@ -46,6 +46,8 @@ public class PushFacade {
         String[] featureTypes = featureType.split(",|，");
         Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
 
+        pushDTO.setHasIndications(data.getHasIndications());
+
         //症状
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Symptom.getKey()))) {
             List<ConceptPushDTO> symptom = data.getSymptom();