|
@@ -44,11 +44,13 @@ public class LisExcelResFacade {
|
|
@Autowired
|
|
@Autowired
|
|
TranServiceClient tranServiceClient;
|
|
TranServiceClient tranServiceClient;
|
|
|
|
|
|
- public RespDTO<LitAssayVO> lisExcelAnalysis(MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
|
|
|
|
|
|
+ @SuppressWarnings("null")
|
|
|
|
+ public RespDTO<LitAssayVO> lisExcelAnalysis(MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
|
|
|
|
|
|
List<String> messages = new ArrayList<>();
|
|
List<String> messages = new ArrayList<>();
|
|
List<LisExcelWrapperVO> lisExcelWrapperList = new ArrayList<>();
|
|
List<LisExcelWrapperVO> lisExcelWrapperList = new ArrayList<>();
|
|
InputStream inputStream = null;
|
|
InputStream inputStream = null;
|
|
|
|
+ List<String> assemblys = new ArrayList<String>();
|
|
Workbook wb = null;
|
|
Workbook wb = null;
|
|
try {
|
|
try {
|
|
if (!file.isEmpty()) {
|
|
if (!file.isEmpty()) {
|
|
@@ -107,8 +109,11 @@ public class LisExcelResFacade {
|
|
}
|
|
}
|
|
LisExcelWrapperVO lisExcelWrapper = new LisExcelWrapperVO();
|
|
LisExcelWrapperVO lisExcelWrapper = new LisExcelWrapperVO();
|
|
|
|
|
|
|
|
+
|
|
lisExcelWrapper.setMealName(mealName);
|
|
lisExcelWrapper.setMealName(mealName);
|
|
lisExcelWrapper.setItemName(itemName);
|
|
lisExcelWrapper.setItemName(itemName);
|
|
|
|
+ String assembly = mealName+"--"+itemName;
|
|
|
|
+ assemblys.add(assembly);
|
|
// lisExcelWrapper.setUniqueName(uniqueName);
|
|
// lisExcelWrapper.setUniqueName(uniqueName);
|
|
lisExcelWrapper.setUnit(unit);
|
|
lisExcelWrapper.setUnit(unit);
|
|
lisExcelWrapper.setValue(value);
|
|
lisExcelWrapper.setValue(value);
|
|
@@ -141,6 +146,7 @@ public class LisExcelResFacade {
|
|
messages.add("无文件上传!");
|
|
messages.add("无文件上传!");
|
|
}
|
|
}
|
|
//匹配公表名
|
|
//匹配公表名
|
|
|
|
+ lisHospitalCodeVO.setAssemblys(assemblys);
|
|
RespDTO<List<LisConfigDTO>> litDatas = tranServiceClient.getLisConfigByhospitalId(lisHospitalCodeVO);
|
|
RespDTO<List<LisConfigDTO>> litDatas = tranServiceClient.getLisConfigByhospitalId(lisHospitalCodeVO);
|
|
if (litDatas == null || !"0".equals(litDatas.code)) {
|
|
if (litDatas == null || !"0".equals(litDatas.code)) {
|
|
throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
|
|
throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
|
|
@@ -153,7 +159,7 @@ public class LisExcelResFacade {
|
|
for (LisExcelWrapperVO lisExcelWrapperNew : lisExcelWrapperList) {
|
|
for (LisExcelWrapperVO lisExcelWrapperNew : lisExcelWrapperList) {
|
|
|
|
|
|
for (LisConfigDTO LisNew : litData) {
|
|
for (LisConfigDTO LisNew : litData) {
|
|
- if (LisNew.getItemName() != null) {
|
|
|
|
|
|
+ /* if (LisNew.getItemName() != null) {
|
|
if (LisNew.getMealName().equals(lisExcelWrapperNew.getMealName())
|
|
if (LisNew.getMealName().equals(lisExcelWrapperNew.getMealName())
|
|
&& LisNew.getItemName().equals(lisExcelWrapperNew.getItemName())) {
|
|
&& LisNew.getItemName().equals(lisExcelWrapperNew.getItemName())) {
|
|
lisExcelWrapperNew.setUniqueName(LisNew.getUniqueName());
|
|
lisExcelWrapperNew.setUniqueName(LisNew.getUniqueName());
|
|
@@ -162,8 +168,11 @@ public class LisExcelResFacade {
|
|
if (LisNew.getMealName().equals(lisExcelWrapperNew.getMealName())) {
|
|
if (LisNew.getMealName().equals(lisExcelWrapperNew.getMealName())) {
|
|
lisExcelWrapperNew.setUniquemealName(LisNew.getUniqueName());
|
|
lisExcelWrapperNew.setUniquemealName(LisNew.getUniqueName());
|
|
}
|
|
}
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ }*/
|
|
|
|
+ String newName = lisExcelWrapperNew.getMealName()+"--"+lisExcelWrapperNew.getItemName();
|
|
|
|
+ if(LisNew.getAssembly().equals(newName)){
|
|
|
|
+ lisExcelWrapperNew.setUniquemealName(LisNew.getUniqueName());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
lisExcelWrapperListNew.add(lisExcelWrapperNew);
|
|
lisExcelWrapperListNew.add(lisExcelWrapperNew);
|
|
}
|
|
}
|