|
|
@@ -22,7 +22,6 @@ import java.util.Arrays;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @author wangzl
|
|
|
@@ -47,15 +46,15 @@ public class BusReceiveRecordUpdateImpl extends ServiceImpl<BusReceiveRecordUpda
|
|
|
log.info("泵表数据为空");
|
|
|
return;
|
|
|
}
|
|
|
- if(StrUtil.isBlank(pumpEntity.getPatientCode())){
|
|
|
+ if (StrUtil.isBlank(pumpEntity.getPatientCode())) {
|
|
|
log.info("患者编码为空 对象 {}", pumpEntity);
|
|
|
return;
|
|
|
}
|
|
|
- if(StrUtil.isBlank(pumpEntity.getHospitalCode())){
|
|
|
+ if (StrUtil.isBlank(pumpEntity.getHospitalCode())) {
|
|
|
log.info("医院编码为空 对象 {}", pumpEntity);
|
|
|
return;
|
|
|
}
|
|
|
- if(StrUtil.isBlank(pumpEntity.getPumpCode())){
|
|
|
+ if (StrUtil.isBlank(pumpEntity.getPumpCode())) {
|
|
|
log.info("泵编码为空 传入内容 {}", pumpEntity);
|
|
|
return;
|
|
|
}
|
|
|
@@ -78,8 +77,8 @@ public class BusReceiveRecordUpdateImpl extends ServiceImpl<BusReceiveRecordUpda
|
|
|
String updateMd5 = DigestUtil.md5Hex(updateEntityMap.toString());
|
|
|
if (!pumpMd5.equals(updateMd5)) {
|
|
|
this.save(insertUpdateEntity);
|
|
|
- }else {
|
|
|
- log.info("数据无修改无须插入 泵码{} , 医院code {} ,患者编码 {}",pumpEntity.getPumpCode(),pumpEntity.getHospitalCode(),pumpEntity.getPatientCode());
|
|
|
+ } else {
|
|
|
+ log.info("数据无修改无须插入 泵码{} , 医院code {} ,患者编码 {}", pumpEntity.getPumpCode(), pumpEntity.getHospitalCode(), pumpEntity.getPatientCode());
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
@@ -111,7 +110,7 @@ public class BusReceiveRecordUpdateImpl extends ServiceImpl<BusReceiveRecordUpda
|
|
|
fullMap.forEach((key, value) -> {
|
|
|
boolean exists = Arrays.asList(includeFields).contains(key);
|
|
|
if (exists) {
|
|
|
- if (value instanceof BigDecimal ) {
|
|
|
+ if (value instanceof BigDecimal) {
|
|
|
BigDecimal value1 = (BigDecimal) value;
|
|
|
resultMap.put(key, value1.setScale(1, RoundingMode.HALF_UP));
|
|
|
} else {
|
