|
@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@ -206,6 +207,7 @@ public class ConsultTeamService {
|
|
|
templateJson.put("id",orderId);
|
|
|
templateJson.put("OrderType",20);
|
|
|
|
|
|
List<String> familyArchiveType3 = new ArrayList<>();
|
|
|
for (int i=0;i<familyArr.size();i++){
|
|
|
JSONObject tmp = familyArr.getJSONObject(i);
|
|
|
String patientId = tmp.getString("id");
|
|
@ -215,6 +217,10 @@ public class ConsultTeamService {
|
|
|
participants.put(patientId, 0);//家庭成员拉入会话
|
|
|
String archiveType = tmp.getString("archiveType");
|
|
|
if ("3".equals(archiveType)){
|
|
|
if (familyArchiveType3.contains(patientId)){//避免重复发送
|
|
|
continue;
|
|
|
}
|
|
|
familyArchiveType3.add(patientId);
|
|
|
String name = tmp.getString("name");
|
|
|
//创建家属系统消息
|
|
|
SystemMessageDO messageDO = new SystemMessageDO();
|
|
@ -422,6 +428,8 @@ public class ConsultTeamService {
|
|
|
JSONObject templateJson = new JSONObject();
|
|
|
templateJson.put("id",orderId);
|
|
|
templateJson.put("OrderType",22);
|
|
|
|
|
|
List<String> familyArchiveType3 = new ArrayList<>();
|
|
|
for (int i=0;i<familyArr.size();i++){
|
|
|
JSONObject tmp = familyArr.getJSONObject(i);
|
|
|
String patientId = tmp.getString("id");
|
|
@ -432,6 +440,10 @@ public class ConsultTeamService {
|
|
|
participants.put(patientId, 0);
|
|
|
String archiveType = tmp.getString("archiveType");
|
|
|
if ("3".equals(archiveType)){
|
|
|
if (familyArchiveType3.contains(patientId)){//避免重复发送
|
|
|
continue;
|
|
|
}
|
|
|
familyArchiveType3.add(patientId);
|
|
|
String name = tmp.getString("name");
|
|
|
//创建家属系统消息
|
|
|
SystemMessageDO messageDO = new SystemMessageDO();
|