|
@@ -116,6 +116,7 @@ public class KlDiagnoseImportFacade {
|
|
|
importDiagnoseVOList.add(importDiagnoseVO);
|
|
|
}
|
|
|
}
|
|
|
+ addDisName = RegexUtil.getRegexData(addDisName, "【(.*?)】", 1); // 获取名字
|
|
|
groupData.put(addDisName, importDiagnoseVOList); // 添加最后一个
|
|
|
|
|
|
int i = 0;
|
|
@@ -378,10 +379,10 @@ public class KlDiagnoseImportFacade {
|
|
|
|
|
|
for (ImportDiagnoseVO importDiagnoseVO : data) {
|
|
|
String type = importDiagnoseVO.getType();
|
|
|
- String getOrderNo = importDiagnoseVO.getOrderNo();
|
|
|
- if (StringUtil.isNotBlank(type) && StringUtil.isNotBlank(getOrderNo)) {
|
|
|
+ String rule = importDiagnoseVO.getRule();
|
|
|
+ if (StringUtil.isNotBlank(type) && StringUtil.isNotBlank(rule)) {
|
|
|
if ("拟诊".equals(type) || "确诊".equals(type) || "警惕".equals(type)) {
|
|
|
- String[] splitGroup = getOrderNo.split("\\+");
|
|
|
+ String[] splitGroup = rule.split("\\+");
|
|
|
|
|
|
KlDiagnoseTypeVO klDiagnoseTypeVO = new KlDiagnoseTypeVO();
|
|
|
if ("拟诊".equals(type)) {
|