|
@@ -3,6 +3,7 @@ package com.tuoren.web.rabbit;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.lang.TypeReference;
|
|
import cn.hutool.core.lang.TypeReference;
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
@@ -125,11 +126,20 @@ public class RabbitHandle {
|
|
|
undoTime = LocalDateTimeUtil.longToLocalTime(time);
|
|
undoTime = LocalDateTimeUtil.longToLocalTime(time);
|
|
|
data.remove("undoTime");
|
|
data.remove("undoTime");
|
|
|
}
|
|
}
|
|
|
|
|
+ Boolean exceptionFlag = null;
|
|
|
|
|
+ if(data.get("Marking") != null){
|
|
|
|
|
+ exceptionFlag = data.getBoolean("Marking");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
BusPatientEntity patient = data.toJavaObject(BusPatientEntity.class);
|
|
BusPatientEntity patient = data.toJavaObject(BusPatientEntity.class);
|
|
|
|
|
+ if(ObjectUtil.isNotEmpty(exceptionFlag)){
|
|
|
|
|
+ patient.setExceptionFlag(exceptionFlag);
|
|
|
|
|
+ }
|
|
|
if(!existHospital(patient.getHospitalCode())) {
|
|
if(!existHospital(patient.getHospitalCode())) {
|
|
|
return ;
|
|
return ;
|
|
|
}
|
|
}
|
|
|
patient.setUndoTime(undoTime);
|
|
patient.setUndoTime(undoTime);
|
|
|
|
|
+
|
|
|
iBusPatientService.saveOrUpdate(patient);
|
|
iBusPatientService.saveOrUpdate(patient);
|
|
|
if(StrUtil.isNotBlank(patient.getWardCode())){
|
|
if(StrUtil.isNotBlank(patient.getWardCode())){
|
|
|
iBusWordService.insertWord(patient);
|
|
iBusWordService.insertWord(patient);
|