调整

shop/src/main/java/com/zskk/shop/controller/api/TJCallbackController.java

@@ -51,13 +51,14 @@ public class TJCallbackController {
 			@RequestParam("reportid") String reportid,
 			@RequestParam("date") String tjdate,
 			@RequestParam("position") String position,
-			@RequestParam("remark") String remark
+			@RequestParam("remark") String remark,
+			@RequestParam("patientId") String patientId
 			){
 		List<String> uids = familyPeopleService.queryPeopleByPhone(phone);
 		if (uids.isEmpty()){
 			return new ControllerResult(Boolean.FALSE);
 		}
-		userCenterService.pushReportMsg(uids, title, name, reportid, tjdate, position, remark);
+		userCenterService.pushReportMsg(uids, title, name, reportid, tjdate, position, remark, patientId);
 		return new ControllerResult(Boolean.TRUE);
 	}
 }

shop/src/main/java/com/zskk/shop/service/UserCenterService.java

@@ -182,12 +182,12 @@ public class UserCenterService {
 	}
 	
 	public ControllerResult pushReportMsg(List<String> uids, String title, String name, String reportid,
-			String tjdate, String position, String remark){
+			String tjdate, String position, String remark, String patientId){
 		for (String uid: uids){
 			Map<String, Object> data = new HashMap<>();
 			data.put("first", this.getMsgItem(title));
 			data.put("keyword1", this.getMsgItem(name));
-			data.put("keyword2", this.getMsgItem(reportid));
+			data.put("keyword2", this.getMsgItem(patientId));
 			data.put("keyword3", this.getMsgItem(tjdate));
 			data.put("keyword4", this.getMsgItem(position));
 			data.put("remark", this.getMsgItem(remark));