|
@@ -9,6 +9,7 @@ import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
+import com.diagbot.dto.IndexConfigDTO;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
@@ -35,7 +36,7 @@ import com.diagbot.vo.IndexDataVO;
|
|
public class IndexDataFacade extends IndexDataServiceImpl {
|
|
public class IndexDataFacade extends IndexDataServiceImpl {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
- IndexConfigFacade indexConfigFacade;
|
|
|
|
|
|
+ private IndexConfigFacade indexConfigFacade;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 根据疾病id和用户id,开始时间和结束时间 查询用户指标数据
|
|
* 根据疾病id和用户id,开始时间和结束时间 查询用户指标数据
|
|
@@ -90,6 +91,11 @@ public class IndexDataFacade extends IndexDataServiceImpl {
|
|
public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
|
|
public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
|
|
boolean res = false;
|
|
boolean res = false;
|
|
if (null != indexDataSaveVO && ListUtil.isNotEmpty(indexDataSaveVO.getIndexData())) {
|
|
if (null != indexDataSaveVO && ListUtil.isNotEmpty(indexDataSaveVO.getIndexData())) {
|
|
|
|
+ //获取所有需要记录的指标项
|
|
|
|
+ List<IndexConfigDTO> data = indexConfigFacade.getindexConfig(null);
|
|
|
|
+ List<String> indexUniquelist
|
|
|
|
+ = data.stream().map(i->i.getIndexUnique()).collect(Collectors.toList());
|
|
|
|
+
|
|
// 先查询该用户相同就诊号所保留的数据,将其删除
|
|
// 先查询该用户相同就诊号所保留的数据,将其删除
|
|
UpdateWrapper<IndexData> IndexDataUpdate = new UpdateWrapper<>();
|
|
UpdateWrapper<IndexData> IndexDataUpdate = new UpdateWrapper<>();
|
|
Map<String, Object> mapAll = new HashMap<>();
|
|
Map<String, Object> mapAll = new HashMap<>();
|
|
@@ -106,21 +112,23 @@ public class IndexDataFacade extends IndexDataServiceImpl {
|
|
List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
|
|
List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
for (IndexDataVO indexDataNew : indexDatas) {
|
|
for (IndexDataVO indexDataNew : indexDatas) {
|
|
- IndexData indexData = new IndexData();
|
|
|
|
- indexData.setCreator(indexDataSaveVO.getDoctorId().toString());
|
|
|
|
- indexData.setGmtCreate(DateUtil.now());
|
|
|
|
- indexData.setIndexUnique(indexDataNew.getIndexUnique());
|
|
|
|
- try {
|
|
|
|
- indexData.setCreatTime(sdf.parse(indexDataNew.getCreatTime()));
|
|
|
|
- } catch (ParseException e) {
|
|
|
|
- throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
|
|
|
|
|
|
+ if (indexUniquelist.contains(indexDataNew.getIndexUnique())){
|
|
|
|
+ IndexData indexData = new IndexData();
|
|
|
|
+ indexData.setCreator(indexDataSaveVO.getDoctorId().toString());
|
|
|
|
+ indexData.setGmtCreate(DateUtil.now());
|
|
|
|
+ indexData.setIndexUnique(indexDataNew.getIndexUnique());
|
|
|
|
+ try {
|
|
|
|
+ indexData.setCreatTime(sdf.parse(indexDataNew.getCreatTime()));
|
|
|
|
+ } catch (ParseException e) {
|
|
|
|
+ throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
|
|
|
|
+ }
|
|
|
|
+ indexData.setIndexUnit(indexDataNew.getIndexUnit());
|
|
|
|
+ indexData.setIndexValue(indexDataNew.getIndexValue());
|
|
|
|
+ indexData.setInquiryCode(indexDataSaveVO.getInquiryCode());
|
|
|
|
+ indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
|
|
|
|
+ indexData.setPatientId(indexDataSaveVO.getPatientId());
|
|
|
|
+ IndexDataList.add(indexData);
|
|
}
|
|
}
|
|
- indexData.setIndexUnit(indexDataNew.getIndexUnit());
|
|
|
|
- indexData.setIndexValue(indexDataNew.getIndexValue());
|
|
|
|
- indexData.setInquiryCode(indexDataSaveVO.getInquiryCode());
|
|
|
|
- indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
|
|
|
|
- indexData.setPatientId(indexDataSaveVO.getPatientId());
|
|
|
|
- IndexDataList.add(indexData);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
res = insertIndexDataList(IndexDataList);
|
|
res = insertIndexDataList(IndexDataList);
|