Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250115 更新

Browse Source
This commit is contained in:
陈江保
2025-01-15 10:47:37 +08:00
parent 6232afe548
commit 1be596afd3
3 changed files with 17 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/digital/laboratory/platform/entrustment/convert/DrugLiteConvert.java
View File

@@ -27,4 +27,17 @@ public class DrugLiteConvert {
return drugLiteList;
}
/**
* 将药物列表名称连接成字符串。
*
* @param drugLitesJson 药物列表（JSON格式）
* @param delimiter 分隔符
* @return 连接后的字符串
*/
public static String joiningDrugListNameToStr(List<DrugLite> drugLitesJson, String delimiter) {
return convertDirtyLiteByJSON(drugLitesJson)
.stream()
.map(DrugLite::getName)
.collect(Collectors.joining(delimiter));
}
}

2
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
View File

@@ -260,7 +260,7 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
String renewDrugsStr = candidateDrugs.stream().map(DrugLite::getName).collect(Collectors.joining("、"));
Integer analysisOption = item.getAnalysisOption();
EntrustmentIdentificationMaterial oldMaterial = oldInfoMap.get(materialId);
String oldDrugsStr = DrugLiteConvert.convertDirtyLiteByJSON(oldMaterial.getCandidateDrugs()).stream().map(DrugLite::getName).collect(Collectors.joining("、"));
String oldDrugsStr = DrugLiteConvert.joiningDrugListNameToStr(oldMaterial.getCandidateDrugs(), "、");
// 判断有没有对这个检材进行修改oldMaterial.getName().equals(name) && oldMaterial.getAnalysisOption().equals(analysisOption) && oldDrugsStr.equals(renewDrugsStr)
boolean equalsName = oldMaterial.getName().equals(name);

57
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
View File

@@ -805,11 +805,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
EntrustmentIdentificationMaterial material = materialList.get(0);
retSb.append("对检材中是否含有")
.append(
DrugLiteConvert.convertDirtyLiteByJSON(
material.getCandidateDrugs()
).stream()
.map(DrugLite::getName)
.collect(Collectors.joining("、"))
DrugLiteConvert.joiningDrugListNameToStr(material.getCandidateDrugs(), "、")
)
.append("成分进行")
.append(AnalysisOptionEnums.fromCode(material.getAnalysisOption()).getChineseName())
@@ -821,10 +817,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
Collectors.groupingBy(item ->
item.getAnalysisOption() +
"_" +
DrugLiteConvert.convertDirtyLiteByJSON(item.getCandidateDrugs())
.stream()
.map(DrugLite::getName)
.collect(Collectors.joining("")),
DrugLiteConvert.joiningDrugListNameToStr(item.getCandidateDrugs(), ""),
LinkedHashMap::new, // 返回有序map
Collectors.toList())
);
@@ -833,11 +826,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
retSb.append("对1号至")
.append(materialList.size())
.append("号检材中是否含有")
.append(DrugLiteConvert.convertDirtyLiteByJSON(
material.getCandidateDrugs()
).stream()
.map(DrugLite::getName)
.collect(Collectors.joining("、")));
.append(DrugLiteConvert.joiningDrugListNameToStr(material.getCandidateDrugs(), "、"));
retSb.append("成分进行")
.append(AnalysisOptionEnums.fromCode(material.getAnalysisOption()).getChineseName())
.append("检测");
@@ -1065,24 +1054,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
return remoteGenerateWordService.genDeliverCertPhoto(entrustId, acceptNo, caseName, deliverer1Name, deliverer2Name);
}
// @Override
// public String getMaterialMergePhoto(String entrustId, Integer groupCount) {
// //String path=OSSDirectoryConstants.DOCUMENT_ACCEPT_DIRECTORY+"/"+entrustId+"/"+OSSDirectoryConstants.DOCUMENT_ACCEPT_DIRECTORY_DELIVER;
// //先判断如果没有生成，我们就生成，如果生成了，我们就直接取
// Entrustment entrustment = this.getById(entrustId);
// CaseEvent caseEvent = caseEventService.getById(entrustment.getCaseId());
// List<EntrustmentIdentificationMaterial> materialList = entrustmentIdentificationMaterialService
// .list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery()
// .eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustment.getId()));
// List<String> materialIds = new ArrayList<>();
// materialList.forEach(item -> {
// materialIds.add(item.getId());
// });
// String path = remoteGenerateWordService.genMaterialPhoto(entrustId, materialIds, caseEvent.getCaseName(), entrustment.getAcceptNo(), groupCount);
//
// return path;
// }
//
@Override
public Boolean historyDataToTransSys(String status, List<String> entrustIds) {
@@ -1237,21 +1208,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException("委托已经提交, 不能再进行修改");
}
// List<UpdateInfo> pis = entrustment.getProcessInfo();
// if (pis == null) {
// pis = new ArrayList<UpdateInfo>();
// }
// if (pis.size() == 0) {
// UpdateInfo pi = new UpdateInfo(dlpUser.getId(),
// dlpUser.getName(),
// dlpUser.getOrgId(),
// dlpUser.getOrgName(),
// "已创建",
// 1, entrustment.getStatus());
// pis.add(pi);
// }
// entrustment.setProcessInfo(pis);
System.out.println(String.format("保存委托, entrust.getCandidateDrugs()=%s", entrust.getCandidateDrugs()));
@@ -1279,13 +1235,6 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
UpdateWrapper<Entrustment> updateWrapper = new UpdateWrapper<Entrustment>();
updateWrapper.eq("id", entrust.getId()); // 查询条件是 id 相等
// updateWrapper.set("case_id", entrust.getCaseId()); // CaseId 不能修改
// updateWrapper.set("entrustment_no", entrust.getEntrustmentNo()); // EntrustmentNo 不能修改
// updateWrapper.set("process_instance_id", entrust.getProcessInstanceId()); // 不能修改
// updateWrapper.set("entrustment_time", entrust.getEntrustmentTime()); // 不能修改
// updateWrapper.set("client_org_id", entrust.getClientOrgId());
// updateWrapper.set("submitter", entrust.getSubmitter());
// updateWrapper.set("submit_time", entrust.getsubmitTime());
updateWrapper.set("client_org_id", entrust.getClientOrgId());
updateWrapper.set("client_org_name", entrust.getClientOrgName());
updateWrapper.set("client_address", entrust.getClientAddress());