|
@@ -76,12 +76,7 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
|
|
* @param klDiagnoseDetails
|
|
* @param klDiagnoseDetails
|
|
*/
|
|
*/
|
|
public void removeKlDiagnoseDetail(List<KlDiagnoseDetail> klDiagnoseDetails){
|
|
public void removeKlDiagnoseDetail(List<KlDiagnoseDetail> klDiagnoseDetails){
|
|
- List<String> collect = klDiagnoseDetails.stream().filter(x -> (x.getType().equals(91)
|
|
|
|
- || x.getType().equals(92)|| x.getType().equals(93))&& StringUtil.isNotBlank(x.getFormula()))
|
|
|
|
- .map(y -> y.getFormula()).collect(Collectors.toList());
|
|
|
|
- String content = collect.stream().collect(Collectors.joining(","));
|
|
|
|
- //获取公式中的编码
|
|
|
|
- List<String> regexData = RegexUtil.getRegexDatas(content, "([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9])");
|
|
|
|
|
|
+ List<String> regexData = getCodes(klDiagnoseDetails);
|
|
Iterator<KlDiagnoseDetail> iterator = klDiagnoseDetails.iterator();
|
|
Iterator<KlDiagnoseDetail> iterator = klDiagnoseDetails.iterator();
|
|
while (iterator.hasNext()){
|
|
while (iterator.hasNext()){
|
|
KlDiagnoseDetail next = iterator.next();
|
|
KlDiagnoseDetail next = iterator.next();
|
|
@@ -92,4 +87,19 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 获取公式中的所有编码
|
|
|
|
+ * @param klDiagnoseDetails
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ private List<String> getCodes(List<KlDiagnoseDetail> klDiagnoseDetails) {
|
|
|
|
+ String pateern = "([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9])";
|
|
|
|
+ List<String> collect = klDiagnoseDetails.stream().filter(x -> (x.getType().equals(91)
|
|
|
|
+ || x.getType().equals(92)|| x.getType().equals(93))&& StringUtil.isNotBlank(x.getFormula()))
|
|
|
|
+ .map(y -> y.getFormula()).collect(Collectors.toList());
|
|
|
|
+ String content = collect.stream().collect(Collectors.joining(","));
|
|
|
|
+ //获取公式中的编码
|
|
|
|
+ return RegexUtil.getRegexDatas(content, pateern);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|