|
@@ -8,6 +8,7 @@ import com.diagbot.dto.BillNeoMaxDTO;
|
|
|
import com.diagbot.dto.IndicationDTO;
|
|
|
import com.diagbot.dto.NodeNeoDTO;
|
|
|
import com.diagbot.dto.WordCrfDTO;
|
|
|
+import com.diagbot.enums.NeoEnum;
|
|
|
import com.diagbot.model.entity.Clinical;
|
|
|
import com.diagbot.model.entity.Diag;
|
|
|
import com.diagbot.model.entity.Medicine;
|
|
@@ -21,7 +22,6 @@ import com.diagbot.rule.LisRule;
|
|
|
import com.diagbot.rule.PacsRule;
|
|
|
import com.diagbot.rule.SexRule;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
-import com.diagbot.util.CoreUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
@@ -60,6 +60,25 @@ public class BillProcess {
|
|
|
nodeNeoDTO.setName("红细胞压积");
|
|
|
nodeNeoDTO.setVal("阳性");
|
|
|
billNeoDTO.getPacsBillNeoDTO().getLis().add(nodeNeoDTO);
|
|
|
+
|
|
|
+ NodeNeoDTO opereat = new NodeNeoDTO();
|
|
|
+ opereat.setName("胸腔镜下左下肺叶切除术");
|
|
|
+ billNeoDTO.getPacsBillNeoDTO().getOperations().add(opereat);
|
|
|
+ NodeNeoDTO opereat2 = new NodeNeoDTO();
|
|
|
+ opereat2.setName("区域淋巴结清扫术");
|
|
|
+ billNeoDTO.getPacsBillNeoDTO().getOperations().add(opereat2);
|
|
|
+
|
|
|
+ NodeNeoDTO drug = new NodeNeoDTO();
|
|
|
+ drug.setName("拜阿司匹林");
|
|
|
+ billNeoDTO.getPacsBillNeoDTO().getAllergicmeds().add(drug);
|
|
|
+ NodeNeoDTO drug2 = new NodeNeoDTO();
|
|
|
+ drug2.setName("美多芭");
|
|
|
+ billNeoDTO.getPacsBillNeoDTO().getAllergicmeds().add(drug2);
|
|
|
+
|
|
|
+ NodeNeoDTO drug3 = new NodeNeoDTO();
|
|
|
+ drug3.setName("泰舒达");
|
|
|
+ billNeoDTO.getPacsBillNeoDTO().getOralmeds().add(drug3);
|
|
|
+
|
|
|
}
|
|
|
// 测试数据结束
|
|
|
|
|
@@ -94,113 +113,33 @@ public class BillProcess {
|
|
|
List<BillMsg> billMsgList = new ArrayList<>();
|
|
|
for (BillNeoMaxDTO bill : billNeoMaxDTOList) {
|
|
|
// 性别
|
|
|
- SexRule.compareSexWithBill(wordCrfDTO, bill, billMsgList);
|
|
|
+ SexRule.compareSexWithBill(wordCrfDTO, bill, billMsgList, NeoEnum.gender.getName());
|
|
|
+
|
|
|
+ // 年龄
|
|
|
+ AgeRule.compareAgeWithBill(wordCrfDTO, bill, billMsgList, NeoEnum.ageNeoDTO.getName());
|
|
|
|
|
|
// 诊断
|
|
|
- DiagRule.compareDiseaseWithBill(bill.getDisease(), diags, bill, billMsgList);
|
|
|
+ DiagRule.compareDiseaseWithBill(bill.getDisease(), diags, bill, billMsgList, NeoEnum.disease.getName());
|
|
|
|
|
|
//化验
|
|
|
- LisRule.compareLisWithBill(lis, bill, billMsgList);
|
|
|
+ LisRule.compareLisWithBill(lis, bill, billMsgList, NeoEnum.lis.getName());
|
|
|
|
|
|
//辅检
|
|
|
- PacsRule.comparePacsWithBill(bill.getPacs(), pacs, bill, billMsgList);
|
|
|
+ PacsRule.comparePacsWithBill(bill.getPacs(), pacs, bill, billMsgList, NeoEnum.pacs.getName());
|
|
|
|
|
|
//临床表现
|
|
|
- DiagRule.compareDiseaseWithBill(bill.getClinicfindings(), clinicals, bill, billMsgList);
|
|
|
+ DiagRule.compareDiseaseWithBill(bill.getClinicfindings(), clinicals, bill, billMsgList, NeoEnum.clinicfindings.getName());
|
|
|
|
|
|
//手术
|
|
|
- DiagRule.compareDiseaseWithBill(bill.getOperations(), operations, bill, billMsgList);
|
|
|
+ DiagRule.compareDiseaseWithBill(bill.getOperations(), operations, bill, billMsgList, NeoEnum.operations.getName());
|
|
|
|
|
|
//禁忌过敏药品
|
|
|
- DiagRule.compareDiseaseWithBill(bill.getAllergicmeds(), medicines, bill, billMsgList);
|
|
|
+ DiagRule.compareDiseaseWithBill(bill.getAllergicmeds(), medicines, bill, billMsgList, NeoEnum.allergicmeds.getName());
|
|
|
|
|
|
//服用药品
|
|
|
- DiagRule.compareDiseaseWithBill(bill.getOralmeds(), medicines, bill, billMsgList);
|
|
|
-
|
|
|
- // 年龄
|
|
|
- AgeRule.compareAgeWithBill(wordCrfDTO, bill, billMsgList);
|
|
|
+ DiagRule.compareDiseaseWithBill(bill.getOralmeds(), medicines, bill, billMsgList, NeoEnum.oralmeds.getName());
|
|
|
|
|
|
}
|
|
|
indicationDTO.setBillMsgList(billMsgList);
|
|
|
}
|
|
|
- //
|
|
|
- // /**
|
|
|
- // * 化验规则处理
|
|
|
- // *
|
|
|
- // * @param billNeoDTOList
|
|
|
- // * @param wordCrfDTO
|
|
|
- // * @param indicationDTO
|
|
|
- // */
|
|
|
- // public void processBillWithLis(List<BillNeoDTO> billNeoDTOList, WordCrfDTO wordCrfDTO, IndicationDTO indicationDTO) {
|
|
|
- //
|
|
|
- // }
|
|
|
- //
|
|
|
- // /**
|
|
|
- // * 辅检规则处理
|
|
|
- // *
|
|
|
- // * @param billNeoDTOList
|
|
|
- // * @param wordCrfDTO
|
|
|
- // * @param indicationDTO
|
|
|
- // */
|
|
|
- // public void processBillWithPacs(List<BillNeoDTO> billNeoDTOList, WordCrfDTO wordCrfDTO, IndicationDTO indicationDTO) {
|
|
|
- //
|
|
|
- // }
|
|
|
- //
|
|
|
- // /**
|
|
|
- // * 药品规则处理
|
|
|
- // *
|
|
|
- // * @param billNeoDTOList
|
|
|
- // * @param wordCrfDTO
|
|
|
- // * @param indicationDTO
|
|
|
- // */
|
|
|
- // public void processBillWithDrug(List<BillNeoDTO> billNeoDTOList, WordCrfDTO wordCrfDTO, IndicationDTO indicationDTO) {
|
|
|
- // DiagLabel diagLabel = wordCrfDTO.getDiagLabel();
|
|
|
- // ChiefLabel chiefLabel = wordCrfDTO.getChiefLabel();
|
|
|
- // PresentLabel presentLabel = wordCrfDTO.getPresentLabel();
|
|
|
- // List<Diag> diags = new ArrayList<>();
|
|
|
- // List<Clinical> clinicals = new ArrayList<>();
|
|
|
- // if(diagLabel != null){
|
|
|
- // diags = diagLabel.getDiags();
|
|
|
- // }
|
|
|
- // if(chiefLabel != null && ListUtil.isNotEmpty(chiefLabel.getClinicals())){
|
|
|
- // clinicals.addAll(chiefLabel.getClinicals());
|
|
|
- // }
|
|
|
- // // 现病史临床表现数据先不用
|
|
|
- // if(presentLabel != null && ListUtil.isNotEmpty(presentLabel.getClinicals())){
|
|
|
- // clinicals.addAll(presentLabel.getClinicals());
|
|
|
- // }
|
|
|
- // List<Lis> lis = wordCrfDTO.getLis();
|
|
|
- // List<Pacs> pacs = wordCrfDTO.getPacs();
|
|
|
- //
|
|
|
- // List<BillMsg> drugBill = new ArrayList<>();
|
|
|
- // for (BillNeoDTO bill : billNeoDTOList) {
|
|
|
- // DrugBillNeoDTO drug = bill.getDrugBillNeoDTO();
|
|
|
- // // 性别
|
|
|
- // BillMsg sexMsg = SexRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
|
|
|
- // CoreUtil.addBeanToList(drugBill, sexMsg);
|
|
|
- //
|
|
|
- // // 诊断
|
|
|
- // BillMsg billMsg_disease = DiagRule.compareDiseaseWithBill(drug.getDisease(), diags, bill.getName());
|
|
|
- // CoreUtil.addBeanToList(drugBill, billMsg_disease);
|
|
|
- //
|
|
|
- // // //化验
|
|
|
- // // BillMsg lisMsg = LisPacsRule.compareLisPacsWithBill(drug.getLis(), lis, bill.getName());
|
|
|
- // // CoreUtil.addBeanToList(drugBill, lisMsg);
|
|
|
- // //
|
|
|
- // // //辅检
|
|
|
- // // BillMsg pacsMsg = LisPacsRule.compareLisPacsWithBill(drug.getPacs(), pacs, bill.getName());
|
|
|
- // // CoreUtil.addBeanToList(drugBill, pacsMsg);
|
|
|
- // //
|
|
|
- // // //临床表现
|
|
|
- // // BillMsg clinicalMsg = DiagRule.compareDiseaseWithBill(drug.getClinicfindings(), clinicals, bill.getName());
|
|
|
- // // CoreUtil.addBeanToList(drugBill, clinicalMsg);
|
|
|
- //
|
|
|
- // // 年龄
|
|
|
- // BillMsg ageMsg = AgeRule.compareAgeWithBill(drug.getAgeNeoDTO(), wordCrfDTO, bill.getName());
|
|
|
- // CoreUtil.addBeanToList(drugBill, ageMsg);
|
|
|
- //
|
|
|
- // }
|
|
|
- // indicationDTO.setDrugBill(drugBill);
|
|
|
- // }
|
|
|
-
|
|
|
}
|