|
|
|
|
@ -1009,9 +1009,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> |
|
|
|
|
// 拼接仪器编号及名称
|
|
|
|
|
instrumentName += instrument.getName() + "" + instrument.getCode() + ","; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
String replace = instrumentName.replace(",", "\r"); |
|
|
|
|
result1.put("code", instrumentName); |
|
|
|
|
result1.put("code", instrumentName.replace(",", "\r\n")); |
|
|
|
|
result1.put("experieDate", format3.format(taskBlueprint.getCreateTime())); |
|
|
|
|
result1.put("remark", entrust.getRemark()); |
|
|
|
|
result1.put("resultList1", ItemAndAllList); |
|
|
|
|
@ -1191,76 +1189,86 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> |
|
|
|
|
// 诊断试剂
|
|
|
|
|
String[] split1 = examineResult.getReagentId().split(","); |
|
|
|
|
String regentName = ""; |
|
|
|
|
Set<String> set = new HashSet(); |
|
|
|
|
for (int i = 0; i < split1.length; i++) { |
|
|
|
|
Reagent reagent = reagentService.getById(split1[i]); |
|
|
|
|
if (i == (split1.length - 1)) { |
|
|
|
|
regentName += reagent.getName(); |
|
|
|
|
regentName += reagent.getName() + "（生产批号：" + reagent.getBatchNo() + "）" + reagent.getManufacturer(); |
|
|
|
|
} else { |
|
|
|
|
regentName += reagent.getName() + ","; |
|
|
|
|
regentName += reagent.getName() + "（生产批号：" + reagent.getBatchNo() + "）" + reagent.getManufacturer() + "\r\n"; |
|
|
|
|
} |
|
|
|
|
set.add(reagent.getManufacturer()); |
|
|
|
|
} |
|
|
|
|
result.put("7", regentName); |
|
|
|
|
|
|
|
|
|
// 生产厂家及批号
|
|
|
|
|
String manufacturer = ""; |
|
|
|
|
List<String> strList = new ArrayList<>(); |
|
|
|
|
for (String m : set) { |
|
|
|
|
strList.add(m); |
|
|
|
|
} |
|
|
|
|
for (int i = 0; i < strList.size(); i++) { |
|
|
|
|
if (i == (strList.size() - 1)) { |
|
|
|
|
manufacturer += strList.get(i); |
|
|
|
|
} else { |
|
|
|
|
manufacturer += strList.get(i) + ","; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 1.先拿到批次号
|
|
|
|
|
String batchNos = examineResult.getBatchNos(); |
|
|
|
|
String[] split3 = batchNos.split(","); |
|
|
|
|
Map<String, List<String>> tempListMap = new HashMap(); |
|
|
|
|
for (String batch : split3) { |
|
|
|
|
String[] reagentIdAndBatchArr = batch.split("-"); |
|
|
|
|
String reagentId = reagentIdAndBatchArr[0]; |
|
|
|
|
// 试剂中会有中线的情况，如：1101-3，-3也要带着；原以为只有1101
|
|
|
|
|
String realBatch = ""; |
|
|
|
|
if (reagentIdAndBatchArr.length > 2) { |
|
|
|
|
for (int i = 1; i < reagentIdAndBatchArr.length; i++) { |
|
|
|
|
realBatch += reagentIdAndBatchArr[i] + "-"; |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
realBatch = reagentIdAndBatchArr[1]; |
|
|
|
|
} |
|
|
|
|
List<String> list = tempListMap.get(reagentId); |
|
|
|
|
if (CollectionUtils.isNotEmpty(list)) { |
|
|
|
|
list.add(realBatch); |
|
|
|
|
} else { |
|
|
|
|
List<String> temp = new ArrayList<>(); |
|
|
|
|
temp.add(realBatch); |
|
|
|
|
tempListMap.put(reagentId, temp); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
String resultBatchStr = ""; |
|
|
|
|
// 遍历处理批号
|
|
|
|
|
Set<String> strings = tempListMap.keySet(); |
|
|
|
|
for (String reagentId : strings) { |
|
|
|
|
// 根据试剂名称查询厂家名称
|
|
|
|
|
Reagent reagent = reagentService.getById(reagentId); |
|
|
|
|
String manufacturerName = reagent.getManufacturer(); |
|
|
|
|
List<String> list = tempListMap.get(reagentId); |
|
|
|
|
resultBatchStr += manufacturerName + "：批号("; |
|
|
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
|
|
String realBatch = list.get(i); |
|
|
|
|
resultBatchStr += realBatch; |
|
|
|
|
if (i != list.size() - 1) { |
|
|
|
|
resultBatchStr += "、"; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
resultBatchStr += ")"; |
|
|
|
|
} |
|
|
|
|
result.put("8", resultBatchStr); |
|
|
|
|
// Set<String> set = new HashSet();
|
|
|
|
|
// for (int i = 0; i < split1.length; i++) {
|
|
|
|
|
// Reagent reagent = reagentService.getById(split1[i]);
|
|
|
|
|
// if (i == (split1.length - 1)) {
|
|
|
|
|
// regentName += reagent.getName();
|
|
|
|
|
// } else {
|
|
|
|
|
// regentName += reagent.getName() + ",";
|
|
|
|
|
// }
|
|
|
|
|
// set.add(reagent.getManufacturer());
|
|
|
|
|
// }
|
|
|
|
|
// result.put("7", regentName);
|
|
|
|
|
//
|
|
|
|
|
// // 生产厂家及批号
|
|
|
|
|
// String manufacturer = "";
|
|
|
|
|
// List<String> strList = new ArrayList<>();
|
|
|
|
|
// for (String m : set) {
|
|
|
|
|
// strList.add(m);
|
|
|
|
|
// }
|
|
|
|
|
// for (int i = 0; i < strList.size(); i++) {
|
|
|
|
|
// if (i == (strList.size() - 1)) {
|
|
|
|
|
// manufacturer += strList.get(i);
|
|
|
|
|
// } else {
|
|
|
|
|
// manufacturer += strList.get(i) + ",";
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// // 1.先拿到批次号
|
|
|
|
|
// String batchNos = examineResult.getBatchNos();
|
|
|
|
|
// String[] split3 = batchNos.split(",");
|
|
|
|
|
// Map<String, List<String>> tempListMap = new HashMap();
|
|
|
|
|
// for (String batch : split3) {
|
|
|
|
|
// String[] reagentIdAndBatchArr = batch.split("-");
|
|
|
|
|
// String reagentId = reagentIdAndBatchArr[0];
|
|
|
|
|
// // 试剂中会有中线的情况，如：1101-3，-3也要带着；原以为只有1101
|
|
|
|
|
// String realBatch = "";
|
|
|
|
|
// if (reagentIdAndBatchArr.length > 2) {
|
|
|
|
|
// for (int i = 1; i < reagentIdAndBatchArr.length; i++) {
|
|
|
|
|
// realBatch += reagentIdAndBatchArr[i] + "-";
|
|
|
|
|
// }
|
|
|
|
|
// } else {
|
|
|
|
|
// realBatch = reagentIdAndBatchArr[1];
|
|
|
|
|
// }
|
|
|
|
|
// List<String> list = tempListMap.get(reagentId);
|
|
|
|
|
// if (CollectionUtils.isNotEmpty(list)) {
|
|
|
|
|
// list.add(realBatch);
|
|
|
|
|
// } else {
|
|
|
|
|
// List<String> temp = new ArrayList<>();
|
|
|
|
|
// temp.add(realBatch);
|
|
|
|
|
// tempListMap.put(reagentId, temp);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// String resultBatchStr = "";
|
|
|
|
|
// // 遍历处理批号
|
|
|
|
|
// Set<String> strings = tempListMap.keySet();
|
|
|
|
|
// for (String reagentId : strings) {
|
|
|
|
|
// // 根据试剂名称查询厂家名称
|
|
|
|
|
// Reagent reagent = reagentService.getById(reagentId);
|
|
|
|
|
// String manufacturerName = reagent.getManufacturer();
|
|
|
|
|
// List<String> list = tempListMap.get(reagentId);
|
|
|
|
|
// resultBatchStr += manufacturerName + "：批号(";
|
|
|
|
|
// for (int i = 0; i < list.size(); i++) {
|
|
|
|
|
// String realBatch = list.get(i);
|
|
|
|
|
// resultBatchStr += realBatch;
|
|
|
|
|
// if (i != list.size() - 1) {
|
|
|
|
|
// resultBatchStr += "、";
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// resultBatchStr += ")";
|
|
|
|
|
// }
|
|
|
|
|
// result.put("8", resultBatchStr);
|
|
|
|
|
|
|
|
|
|
// 使用仪器名称及编号
|
|
|
|
|
String[] split2 = examineResult.getInstrumentId().split(","); |
|
|
|
|
@ -1274,17 +1282,14 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> |
|
|
|
|
instrumentName += s2 + ","; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
result.put("9", instrumentName.replace(",", "\r")); |
|
|
|
|
result.put("9", instrumentName.replace(",", "\r\n")); |
|
|
|
|
// String value = DictBizCache.getValue(DictBizEnum.SIMPLE_STATUS, examineResult.getSimpleStatus());
|
|
|
|
|
result.put("10", examineResult.getSimpleStatus()); |
|
|
|
|
result.put("11", "温度" + examineResult.getTemperature() + "℃; " + "湿度" + examineResult.getHumidity() + "%RH"); |
|
|
|
|
// 操作程序内容
|
|
|
|
|
result.put("12", examineResult.getOperateContent().replace("#", "\r")); |
|
|
|
|
// if (examineBasis != null) {
|
|
|
|
|
// result.put("13", examineBasis.getContent().replace("$", "(char)11"));
|
|
|
|
|
// }
|
|
|
|
|
result.put("12", examineResult.getOperateContent().replace("\n", "\r\n")); |
|
|
|
|
// 结果判定方法和依据
|
|
|
|
|
result.put("13", examineResult.getExamineBasisContent().replace("#", "\r")); |
|
|
|
|
result.put("13", examineResult.getExamineBasisContent().replace("\n", "\r\n")); |
|
|
|
|
String path = sysClient.getParamValue("electronic_signature_real_path").getData(); |
|
|
|
|
// 检测人
|
|
|
|
|
if (!"".equals(examine.getExamineBy()) && examine.getExamineBy() != null) { |
|
|
|
|
@ -3347,12 +3352,16 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> |
|
|
|
|
result.put("flowTime", "/"); |
|
|
|
|
} |
|
|
|
|
//检测任务书交回日期
|
|
|
|
|
if (eTask.getBackCrossTime() != null) { |
|
|
|
|
result.put("backCrossTime", format.format(eTask.getBackCrossTime())); |
|
|
|
|
} |
|
|
|
|
if (eTask.getBackCrossRecipientBy() != null) { |
|
|
|
|
String name1 = userClient.userInfoById(Long.parseLong(eTask.getBackCrossRecipientBy())).getData().getName(); |
|
|
|
|
//接收人
|
|
|
|
|
result.put("backCrossRecipient", name1); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<Map<String, Object>> resultList = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
|
litao
3 years ago