|
@@ -6,6 +6,7 @@ import com.diagbot.dto.BillNeoDTO;
|
|
import com.diagbot.dto.DrugBillNeoDTO;
|
|
import com.diagbot.dto.DrugBillNeoDTO;
|
|
import com.diagbot.dto.WordCrfDTO;
|
|
import com.diagbot.dto.WordCrfDTO;
|
|
import com.diagbot.rule.AgeRule;
|
|
import com.diagbot.rule.AgeRule;
|
|
|
|
+import com.diagbot.rule.DiseaseRule;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
@@ -66,9 +67,14 @@ public class BillProcess {
|
|
for (DrugBillNeoDTO drug : drugBillNeoDTOList) {
|
|
for (DrugBillNeoDTO drug : drugBillNeoDTOList) {
|
|
// 性别
|
|
// 性别
|
|
BillMsg billMsg = AgeRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
|
|
BillMsg billMsg = AgeRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
|
|
|
|
+ // 诊断
|
|
|
|
+ BillMsg billMsg_disease = DiseaseRule.compareDiseaseWithBill(drug.getDisease(), wordCrfDTO, bill.getName());
|
|
if (billMsg != null) {
|
|
if (billMsg != null) {
|
|
drugBill.add(billMsg);
|
|
drugBill.add(billMsg);
|
|
}
|
|
}
|
|
|
|
+ if(billMsg_disease != null){
|
|
|
|
+ drugBill.add(billMsg_disease);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
billDTO.setDrugBill(drugBill);
|
|
billDTO.setDrugBill(drugBill);
|