非洲猪瘟核酸检测复检修改

dev
litao 2 years ago
parent cd04f2776e
commit d3aa6cbd9e
  1. 3
      lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java
  2. 110
      lab-service/lab-lims/src/main/java/org/springblade/lims/demo/Demo.java
  3. 31
      lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java

@ -229,4 +229,7 @@ public class Examine extends BaseEntity implements Serializable {
// 样品处理方式
@TableField(exist = false)
private String sampleHandling;
// 是否复检
private Integer isRecheck;
}

@ -1,110 +0,0 @@
package org.springblade.lims.demo;
public class Demo {
// public static void main(String[] args) throws IOException, InterruptedException {
//
// RSServer rsServer = RSServer.Initiate(2404);// 初始化
//
// rsServer.addDataListener(new IDataListener() {// 添加监听
// @Override
// public void receiveTimmingAck(TimmingAck data) {// 校时指令应答处理
// System.out.println("校时应答->设备编号:" + data.getDeviceId()
// + "\t执行结果:" + data.getStatus());
// }
//
// @Override
// public void receiveTelecontrolAck(TelecontrolAck data) {// 遥控指令应答处理
// System.out.println("遥控应答->设备编号:" + data.getDeviceId()
// + "\t继电器编号:" + data.getRelayId() + "\t执行结果:"
// + data.getStatus());
// }
//
// @Override
// public void receiveStoreData(StoreData data) {// 已存储数据接收处理
// // 遍历节点数据。数据包括网络设备的数据以及各个节点数据。温湿度数据存放在节点数据中
// for (NodeData nd : data.getNodeList()) {
// SimpleDateFormat sdf = new SimpleDateFormat(
// "yy-MM-dd HH:mm:ss");
// String str = sdf.format(nd.getRecordTime());
// System.out.println("存储数据->设备地址:" + data.getDeviceId()
// + "\t节点:" + nd.getNodeId() + "\t温度:" + nd.getTem()
// + "\t湿度:" + nd.getHum() + "\t存储时间:" + str);
// }
//
// }
//
// @Override
// public void receiveRealtimeData(RealTimeData data) {// 实时数据接收处理
// // 遍历节点数据。数据包括网络设备的数据以及各个节点数据。温湿度数据存放在节点数据中
// for (NodeData nd : data.getNodeList()) {
// System.out.println("实时数据->设备地址:" + data.getDeviceId()
// + "\t节点:" + nd.getNodeId() + "\t温度:" + nd.getTem()
// + "\t湿度:" + nd.getHum() + "\t经度:" + data.getLng()
// + "\t纬度:" + data.getLat() + "\t坐标类型:"
// + data.getCoordinateType() + "\t继电器状态:"
// + data.getRelayStatus());
// }
//
// }
//
// @Override
// public void receiveLoginData(LoginData data) {// 登录数据接收处理
// System.out.println("登录->设备地址:" + data.getDeviceId());
//
// }
//
// @Override
// public void receiveParamIds(ParamIdsData data) {
// String str = "设备参数编号列表->设备编号:" + data.getDeviceId()
// + "\t参数总数量:" + data.getTotalCount() + "\t本帧参数数量:"
// + data.getCount() + "\r\n";
// for (int paramId : data.getPararmIdList())// 遍历设备中参数id编号
// {
// str += paramId + ",";
// }
// System.out.println(str);
//
// }
//
// @Override
// public void receiveParam(ParamData data) {
// String str = "设备参数->设备编号:" + data.getDeviceId() + "\r\n";
//
// for (ParamItem pararm : data.getParameterList()) {
// str += "参数编号:"
// + pararm.getParamId()
// + "\t参数描述:"
// + pararm.getDescription()
// + "\t参数值:"
// + (pararm.getValueDescription() == null ? pararm
// .getValue() : pararm.getValueDescription()
// .get(pararm.getValue())) + "\r\n";
// }
// System.out.println(str);
//
// }
//
// @Override
// public void receiveWriteParamAck(WriteParamAck data) {
// String str = "下载设备参数->设备编号:" + data.getDeviceId() + "\t参数数量:"
// + data.getCount() + "\t"
// + (data.isSuccess() ? "下载成功" : "下载失败");
// System.out.println(str);
//
// }
//
// @Override
// public void receiveTransDataAck(TransDataAck data) {
// String str = "数据透传->设备编号:" + data.getDeviceId() + "\t响应结果:"
// + data.getData() + "\r\n字节数:" + data.getTransDataLen();
// System.out.println(str);
//
// }
// });
// rsServer.start();
//
// }
}

@ -426,26 +426,9 @@ public class ExamineResultServiceImpl extends BaseServiceImpl<ExamineResultMappe
List<PCR2Excel> pcr2Excels = new ArrayList<>();
Map<String, List<PCR2Excel>> listMap = read.stream().collect(Collectors.groupingBy(PCRExcel::getExperieNum));
// String[] split = examine.getExperieNum().split(",");
// for (String s : split) {
// List<PCR2Excel> excelList = listMap.get(s);
// for (PCR2Excel pcr2Excel : excelList) {
// if (!"/".equals(pcr2Excel.getCtValue())) {
// pcr2Excels.add(pcr2Excel);
// }
// }
//
// if (pcr2Excels.size() > 0) {
// pcr2Excels.sort(Comparator.comparing(pcr2Excel -> pcr2Excel.getCtValue().replace(" ", "")));
// excels.add(pcr2Excels.get(0));
// pcr2Excels.clear();
// } else {
// excels.add(excelList.get(0));
// }
// }
for (Map.Entry<String, List<PCR2Excel>> stringListEntry : listMap.entrySet()) {
List<PCR2Excel> excelList = stringListEntry.getValue();
String[] split = examine.getExperieNum().split(",");
for (String s : split) {
List<PCR2Excel> excelList = listMap.get(s);
for (PCR2Excel pcr2Excel : excelList) {
if (!"/".equals(pcr2Excel.getCtValue())) {
pcr2Excels.add(pcr2Excel);
@ -453,13 +436,15 @@ public class ExamineResultServiceImpl extends BaseServiceImpl<ExamineResultMappe
}
if (pcr2Excels.size() > 0) {
pcr2Excels.sort(Comparator.comparing(pcr2Excel -> pcr2Excel.getCtValue().replace(" ", "")));
pcr2Excels.sort(Comparator.comparing(pcr2Excel -> Integer.parseInt(pcr2Excel.getCtValue().replace(" ", ""))));
excels.add(pcr2Excels.get(0));
pcr2Excels.clear();
} else {
excels.add(excelList.get(0));
}
}
excels.add(read.get(read.size() - 2));
excels.add(read.get(read.size() - 1));
}
LambdaQueryWrapper<ExamineResult> wrapper = new LambdaQueryWrapper<>();
@ -640,13 +625,13 @@ public class ExamineResultServiceImpl extends BaseServiceImpl<ExamineResultMappe
String yang = "";
if (entry.getConformityType() == 1) {
for (int i = 0; i < split.length - 1; i++) {
for (int i = 0; i < split.length; i++) {
yang += split[i] + ",";
}
} else {
// 检测编号前缀
String qz = split[0].split("-")[0] + "-" + split[0].split("-")[1] + "-";
for (int i = 0; i < split.length - 1; i++) {
for (int i = 0; i < split.length; i++) {
String[] num = split[i].split("-");
if (num.length == 4) {
int startNum = Integer.parseInt(num[num.length - 2]);

Loading…
Cancel
Save