修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -103,6 +103,9 @@ public class AlertCalledController extends BaseController {
     private static String ALETR_TYPE_AID = "1214";
     private static String ALETR_TYPE_AID_STATUS = "patientStatus";
 
+    private static String ALETR_TYPE_HKQJY = "230";
+    private static String ALETR_TYPE_LYBZ = "237";
+
 
 	@Autowired
 	private EmqKeeper emqKeeper;
@@ -178,6 +181,18 @@ public class AlertCalledController extends BaseController {
             });
             alertCalledObjsDto.setAlertFormValue(alertFormValue);
         }
+
+        if (alertCalled.getAlertTypeCode().equals(ALETR_TYPE_HKQJY)||alertCalled.getAlertTypeCode().equals(ALETR_TYPE_LYBZ)) {
+            List<AlertFormValue> alertFormValue = alertCalledObjsDto.getAlertFormValue();
+            alertFormValue.forEach(e -> {
+                if (e.getFieldCode().equals("flightNumber") && e.getFieldValue() != null) {
+                    String fieldValue = e.getFieldValue();
+                    e.setFieldValue(e.getFieldValueCode());
+                    e.setFieldValueCode(fieldValue);
+                }
+            });
+        }
+
         alertCalledObjsDto.setAlertCalled(alertCalled);
         alertCalledObjsDto = iAlertCalledService.createAlertCalled(alertCalledObjsDto);
         toSendCompletePoliceSituationMatch(alertCalledObjsDto.getAlertCalled().getSequenceNbr());

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -410,7 +410,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				for (AlertFormValue alertFormValue : list) {
 					if("flightNumber".equals(alertFormValue.getFieldCode())) {
 						FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-								"text", ValidationUtil.isEmpty(alertFormValue.getFieldValue()) ?  alertFormValue.getFieldValueCode() : alertFormValue.getFieldValue()  , alertFormValue.getBlock());
+								"text", ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode()  , alertFormValue.getBlock());
 						formValue.add(value);
 						continue;
 					}