zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质控数据保存

Browse Source
This commit is contained in:
王兴荣
2025-11-07 09:58:38 +08:00
parent d51637e44a
commit c7bcf07f72
5 changed files with 274 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisController.java
View File

@@ -45,6 +45,12 @@ public class SampleAnalysisController {
return success(businessAssayTaskAnalysisSampleAndQcProject); return success(businessAssayTaskAnalysisSampleAndQcProject);
} }
@PostMapping("/saveBatchSmpleAndQcAnalysis")
public CommonResult<?> saveBatchSmpleAndQcAnalysis(@RequestBody BusinessAssayTaskAnalysisSampleAndQcProjectRespVO vo) {
sampleAnalysisService.saveBatchSmpleAndQcAnalysis(vo);
return success("成功");
}
@PostMapping("/submitSampleAnalysisByTaskId") @PostMapping("/submitSampleAnalysisByTaskId")
public CommonResult<?> submitSampleAnalysisByTaskId(Long businessAssayTaskId) { public CommonResult<?> submitSampleAnalysisByTaskId(Long businessAssayTaskId) {

10
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientParameterDataMapper.java
View File

@@ -67,5 +67,15 @@ public interface BusinessQCCoefficientParameterDataMapper extends BaseMapperX<Bu
.eqIfPresent(BusinessQCCoefficientParameterDataDO::getRemark, reqVO.getRemark()) .eqIfPresent(BusinessQCCoefficientParameterDataDO::getRemark, reqVO.getRemark())
.orderByAsc(ConfigQCSampleMethodParameterDO::getSortNo)); .orderByAsc(ConfigQCSampleMethodParameterDO::getSortNo));
} }
default List<BusinessQCCoefficientParameterDataDO> selectByBusinessQCCoefficientDataId(Long businessQCCoefficientDataId) {
return selectList(new LambdaQueryWrapperX<BusinessQCCoefficientParameterDataDO>()
.eq(BusinessQCCoefficientParameterDataDO::getBusinessQCCoefficientDataId, businessQCCoefficientDataId));
}
default List<BusinessQCCoefficientParameterDataDO> selectByBusinessQCCoefficientDataIds(List<Long> businessQCCoefficientDataIds) {
return selectList(new LambdaQueryWrapperX<BusinessQCCoefficientParameterDataDO>()
.in(BusinessQCCoefficientParameterDataDO::getBusinessQCCoefficientDataId, businessQCCoefficientDataIds));
}
} }

12
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementParameterDataMapper.java
View File

@@ -64,6 +64,16 @@ public interface BusinessQCManagementParameterDataMapper extends BaseMapperX<Bus
.eqIfPresent(BusinessQCManagementParameterDataDO::getUpdateCount, reqVO.getUpdateCount()) .eqIfPresent(BusinessQCManagementParameterDataDO::getUpdateCount, reqVO.getUpdateCount())
.eqIfPresent(BusinessQCManagementParameterDataDO::getRemark, reqVO.getRemark()) .eqIfPresent(BusinessQCManagementParameterDataDO::getRemark, reqVO.getRemark())
.orderByAsc(ConfigAssayMethodProjectParameterDO::getSortNo)); .orderByAsc(ConfigAssayMethodProjectParameterDO::getSortNo));
} }
default List<BusinessQCManagementParameterDataDO> selectByBusinessQCManagementProjectDataId(Long businessQCManagementProjectDataId) {
return selectList(new LambdaQueryWrapperX<BusinessQCManagementParameterDataDO>()
.eq(BusinessQCManagementParameterDataDO::getBusinessQCManagementProjectDataId, businessQCManagementProjectDataId));
}
default List<BusinessQCManagementParameterDataDO> selectByBusinessQCManagementProjectDataIds(List<Long> businessQCManagementProjectDataIds) {
return selectList(new LambdaQueryWrapperX<BusinessQCManagementParameterDataDO>()
.in(BusinessQCManagementParameterDataDO::getBusinessQCManagementProjectDataId, businessQCManagementProjectDataIds));
}
} }

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisService.java
View File

@@ -42,4 +42,10 @@ public interface SampleAnalysisService {
*/ */
void submitSampleAnalysisByTaskId(Long businessAssayTaskId); void submitSampleAnalysisByTaskId(Long businessAssayTaskId);
/**
* 批量保存任务单录入数据
* @param vo
*/
void saveBatchSmpleAndQcAnalysis(BusinessAssayTaskAnalysisSampleAndQcProjectRespVO vo);
} }

241
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java
View File

@@ -34,7 +34,10 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO;
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayParameterDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayParameterDataMapper;
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayProjectDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayProjectDataMapper;
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper;
@@ -597,6 +600,244 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
} }
return list; return list;
} }
@Override
@Transactional(rollbackFor = Exception.class)
public void saveBatchSmpleAndQcAnalysis(BusinessAssayTaskAnalysisSampleAndQcProjectRespVO vo) {
BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(vo.getBusinessAssayTaskId());
businessAssayTaskDO.setFormValue(vo.getFormValue());
businessAssayTaskDO.setAssayTime(vo.getAssayTime());
businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.SAVED);
//赋值数据集id
if (vo.getDataCollectionId() == null) {
ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(businessAssayTaskDO.getConfigAssayMethodId());
DataCollectionDO dataCollectionDO = dataCollectionService.getLatestDataCollectionByKey(configAssayMethodDO.getDataCollectionKey());
businessAssayTaskDO.setFormDataCollectionId(dataCollectionDO.getId());
} else {
businessAssayTaskDO.setFormDataCollectionId(vo.getDataCollectionId());
}
List<BusinessAssayTaskAnalysisDataRespVO> assayTaskAnalysisDataList = vo.getAssayTaskAnalysisDataList();
for (BusinessAssayTaskAnalysisDataRespVO businessAssayTaskAnalysisDataRespVO : assayTaskAnalysisDataList) {
if ("analysis".equals(businessAssayTaskAnalysisDataRespVO.getAnalysisType())) {
List<BusinessAssayTaskDataDO> businessAssayTaskDataList = businessAssayTaskDataMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>().eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, vo.getBusinessAssayTaskId()).eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId()));
List<Long> businessAssayTaskDataIdList = businessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
List<BusinessAssayProjectDataDO> businessAssayProjectDataList = businessAssayProjectDataMapper.selectList(new LambdaQueryWrapperX<BusinessAssayProjectDataDO>().in(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, businessAssayTaskDataIdList));
List<Long> businessAssayProjectDataIdList = businessAssayProjectDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
List<BusinessAssayParameterDataDO> businessAssayParameterDataList = businessAssayParameterDataMapper.selectList(new LambdaQueryWrapperX<BusinessAssayParameterDataDO>().in(BusinessAssayParameterDataDO::getBusinessAssayProjectDataId, businessAssayProjectDataIdList));
List<Map<String,Object>> datas = businessAssayTaskAnalysisDataRespVO.getDatas();
for (Map<String, Object> map : datas) {
List<BusinessAssayProjectAndParameterRespVO> listBusinessAssayProjectAndParameter = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
Object val = entry.getValue();
if (val instanceof String) {
continue;
}
BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class);
listBusinessAssayProjectAndParameter.add(businessAssayProjectAndParameter);
}
for (BusinessAssayProjectAndParameterRespVO pap : listBusinessAssayProjectAndParameter) {
if ("project".equals(pap.getType())) {
BusinessAssayProjectDataDO businessAssayProjectDataDO = businessAssayProjectDataList.stream().filter(f -> f.getId().equals(pap.getId())).findFirst().orElse(null);
if (StringUtils.isNotBlank(pap.getValue())) {
String dataType = pap.getDataType();//string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
switch (dataType) {
case "int":
case "date":
case "datetime":
case "string":
businessAssayProjectDataDO.setValue(pap.getValue());
businessAssayProjectDataDO.setRemark(pap.getShowName() + ": " + pap.getValue());
break;
case "decimal":
BigDecimal value = new BigDecimal(pap.getValue());
value = value.setScale(pap.getDecimalPosition(), RoundingMode.HALF_EVEN);
businessAssayProjectDataDO.setValue(value.toPlainString());
businessAssayProjectDataDO.setRemark(pap.getShowName() + ": " + value.toPlainString());
break;
default:
throw new IllegalArgumentException("Unexpected value: " + dataType);
}
} else {
businessAssayProjectDataDO.setValue(null);
}
} else if ("parameter".equals(pap.getType())) {
BusinessAssayParameterDataDO businessAssayParameterDataDO = businessAssayParameterDataList.stream().filter(f -> f.getId().equals(pap.getId())).findFirst().orElse(null);
if (StringUtils.isNotBlank(pap.getValue())) {
String dataType = pap.getDataType();//string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
switch (dataType) {
case "int":
case "date":
case "datetime":
case "string":
businessAssayParameterDataDO.setValue(pap.getValue());
businessAssayParameterDataDO.setRemark(pap.getShowName() + ": " + pap.getValue());
break;
case "decimal":
BigDecimal value = new BigDecimal(pap.getValue());
value = value.setScale(pap.getDecimalPosition(), RoundingMode.HALF_EVEN);
businessAssayParameterDataDO.setValue(value.toPlainString());
businessAssayParameterDataDO.setRemark(pap.getShowName() + ": " + value.toPlainString());
break;
default:
throw new IllegalArgumentException("Unexpected value: " + dataType);
}
} else {
businessAssayParameterDataDO.setValue(null);
}
}
}
}
businessAssayProjectDataMapper.updateBatch(businessAssayProjectDataList);
if (CollUtil.isNotEmpty(businessAssayParameterDataList)) {
businessAssayParameterDataMapper.updateBatch(businessAssayParameterDataList);
}
} else if ("zky".equals(businessAssayTaskAnalysisDataRespVO.getAnalysisType())) {
List<BusinessQCManagementDataDO> BusinessQCManagementDataList = businessQCManagementDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());
List<Long> businessQCManagementDataIdList = BusinessQCManagementDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
List<BusinessQCManagementProjectDataDO> businessQCManagementProjectDataList = businessQCManagementProjectDataMapper.selectByBusinessQCManagementDataIds(businessQCManagementDataIdList);
List<Long> businessQCManagementProjectDataIdList = businessQCManagementProjectDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
List<BusinessQCManagementParameterDataDO> businessQCManagementParameterDataList = businessQCManagementParameterDataMapper.selectByBusinessQCManagementProjectDataIds(businessQCManagementProjectDataIdList);
List<Map<String,Object>> datas = businessAssayTaskAnalysisDataRespVO.getDatas();
for (Map<String, Object> map : datas) {
List<BusinessAssayProjectAndParameterRespVO> listBusinessAssayProjectAndParameter = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
Object val = entry.getValue();
if (val instanceof String) {
continue;
}
BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class);
listBusinessAssayProjectAndParameter.add(businessAssayProjectAndParameter);
}
for (BusinessAssayProjectAndParameterRespVO pap : listBusinessAssayProjectAndParameter) {
if ("project".equals(pap.getType())) {
BusinessQCManagementProjectDataDO businessQCManagementProjectDataDO = businessQCManagementProjectDataList.stream().filter(f -> f.getId().equals(pap.getId())).findFirst().orElse(null);
if (StringUtils.isNotBlank(pap.getValue())) {
String dataType = pap.getDataType();//string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
switch (dataType) {
case "int":
case "date":
case "datetime":
case "string":
businessQCManagementProjectDataDO.setValue(pap.getValue());
businessQCManagementProjectDataDO.setRemark(pap.getShowName() + ": " + pap.getValue());
break;
case "decimal":
BigDecimal value = new BigDecimal(pap.getValue());
value = value.setScale(pap.getDecimalPosition(), RoundingMode.HALF_EVEN);
businessQCManagementProjectDataDO.setValue(value.toPlainString());
businessQCManagementProjectDataDO.setRemark(pap.getShowName() + ": " + value.toPlainString());
break;
default:
throw new IllegalArgumentException("Unexpected value: " + dataType);
}
} else {
businessQCManagementProjectDataDO.setValue(null);
}
} else if ("parameter".equals(pap.getType())) {
BusinessQCManagementParameterDataDO businessQCManagementParameterDataDO = businessQCManagementParameterDataList.stream().filter(f -> f.getId().equals(pap.getId())).findFirst().orElse(null);
if (StringUtils.isNotBlank(pap.getValue())) {
String dataType = pap.getDataType();//string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
switch (dataType) {
case "int":
case "date":
case "datetime":
case "string":
businessQCManagementParameterDataDO.setValue(pap.getValue());
businessQCManagementParameterDataDO.setRemark(pap.getShowName() + ": " + pap.getValue());
break;
case "decimal":
BigDecimal value = new BigDecimal(pap.getValue());
value = value.setScale(pap.getDecimalPosition(), RoundingMode.HALF_EVEN);
businessQCManagementParameterDataDO.setValue(value.toPlainString());
businessQCManagementParameterDataDO.setRemark(pap.getShowName() + ": " + value.toPlainString());
break;
default:
throw new IllegalArgumentException("Unexpected value: " + dataType);
}
} else {
businessQCManagementParameterDataDO.setValue(null);
}
}
}
}
businessQCManagementProjectDataMapper.updateBatch(businessQCManagementProjectDataList);
if (CollUtil.isNotEmpty(businessQCManagementParameterDataList)) {
businessQCManagementParameterDataMapper.updateBatch(businessQCManagementParameterDataList);
}
} else {
List<BusinessQCCoefficientDataDO> businessQCCoefficientDataList = businessQCCoefficientDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());
List<Long> businessQCCoefficientDataIdList = businessQCCoefficientDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
List<BusinessQCCoefficientParameterDataDO> businessQCCoefficientParameterDataList = businessQCCoefficientParameterDataMapper.selectByBusinessQCCoefficientDataIds(businessQCCoefficientDataIdList);
List<Map<String,Object>> datas = businessAssayTaskAnalysisDataRespVO.getDatas();
for (Map<String, Object> map : datas) {
List<BusinessAssayProjectAndParameterRespVO> listBusinessAssayProjectAndParameter = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
Object val = entry.getValue();
if (val instanceof String) {
continue;
}
BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class);
listBusinessAssayProjectAndParameter.add(businessAssayProjectAndParameter);
}
for (BusinessAssayProjectAndParameterRespVO pap : listBusinessAssayProjectAndParameter) {
if ("parameter".equals(pap.getType())) {
BusinessQCCoefficientParameterDataDO businessQCCoefficientParameterDataDO = businessQCCoefficientParameterDataList.stream().filter(f -> f.getId().equals(pap.getId())).findFirst().orElse(null);
if (StringUtils.isNotBlank(pap.getValue())) {
String dataType = pap.getDataType();//string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
switch (dataType) {
case "int":
case "date":
case "datetime":
case "string":
businessQCCoefficientParameterDataDO.setValue(pap.getValue());
businessQCCoefficientParameterDataDO.setRemark(pap.getShowName() + ": " + pap.getValue());
break;
case "decimal":
BigDecimal value = new BigDecimal(pap.getValue());
value = value.setScale(pap.getDecimalPosition(), RoundingMode.HALF_EVEN);
businessQCCoefficientParameterDataDO.setValue(value.toPlainString());
businessQCCoefficientParameterDataDO.setRemark(pap.getShowName() + ": " + value.toPlainString());
break;
default:
throw new IllegalArgumentException("Unexpected value: " + dataType);
}
} else {
businessQCCoefficientParameterDataDO.setValue(null);
}
}
}
}
businessQCCoefficientParameterDataMapper.updateBatch(businessQCCoefficientParameterDataList);
}
}
businessAssayTaskMapper.updateById(businessAssayTaskDO);
}
@Override @Override