和代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/rule/action/PowerTransferAction.java

@@ -24,7 +24,11 @@ import com.yeejoin.amos.component.rule.RuleMethod;
 @RuleActionBean(beanLabel = "调派报送")
 public class PowerTransferAction {
 
-    public static final Logger log = LoggerFactory.getLogger(PowerTransferAction.class);
+    /**
+	 * 
+	 */
+
+	public static final Logger log = LoggerFactory.getLogger(PowerTransferAction.class);
 
     @Autowired
     private AlertSubmittedServiceImpl alertSubmittedService;
@@ -41,7 +45,7 @@ public class PowerTransferAction {
      * @throws Exception 异常
      */
     @RuleMethod(methodLabel = "短信报送", project = "西咸机场119接处警规则")
-    public void sendcmd(String smsCode, String sendType, List<String> sendIds, Object object) throws Exception {
+    public void sendcmd(String smsCode, String sendType, List sendIds, Object object) throws Exception {
 
      //   alertSubmittedService.ruleCallbackAction(smsCode, sendIds, object);
     	System.out.println("8796w39879873298798");

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

@@ -196,9 +196,9 @@ public class RuleAlertCalledService {
 			alertCallePowerTransferRo.setCompany(new ArrayList<>(i));
 			alertCallePowerTransferRo.setPowerTransType(type);
 			StringBuffer stringBuffer = new StringBuffer();
-			stringBuffer.append(" 患者现状："+ageGroup);
-			stringBuffer.append(" 性别："+presentSituation);
-			stringBuffer.append(" 年龄段："+gender);
+			stringBuffer.append(" 患者现状："+ageGroup==null?"无":ageGroup);
+			stringBuffer.append(" 性别："+presentSituation==null?"无":presentSituation);
+			stringBuffer.append(" 年龄段："+gender==null?"无":gender);
 			alertCallePowerTransferRo.setContent(stringBuffer.toString());
 		}
 		// 触发规则