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

fix:报告细节

Browse Source
This commit is contained in:
FCL
2025-11-19 18:09:02 +08:00
parent a26327d4e7
commit 9037a27cb8
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java
View File

@@ -87,6 +87,8 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
for(ReportDocumentDataDO dataDO : dataList){ for(ReportDocumentDataDO dataDO : dataList){
String documentContent = dataDO.getDocumentContent(); String documentContent = dataDO.getDocumentContent();
JSONObject dataJson = JSONObject.parseObject(documentContent); JSONObject dataJson = JSONObject.parseObject(documentContent);
if(dataJson == null)
continue;
if(dataJson.containsKey(field)){ if(dataJson.containsKey(field)){
if(!hasFields.contains( fieldName)){ if(!hasFields.contains( fieldName)){
fieldList.add(fieldDO); fieldList.add(fieldDO);
@@ -404,6 +406,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
String sampleName = dataDO.getSampleName(); String sampleName = dataDO.getSampleName();
String sampleCode = dataDO.getSampleCode(); String sampleCode = dataDO.getSampleCode();
String sampleNameCode = sampleName + " " + sampleCode; String sampleNameCode = sampleName + " " + sampleCode;
t.put("id", dataDO.getId());
t.put("sampleNameCode", sampleNameCode); t.put("sampleNameCode", sampleNameCode);
t.put("sampleName", sampleName); t.put("sampleName", sampleName);
t.put("sampleCode", sampleCode); t.put("sampleCode", sampleCode);