|
@@ -14,11 +14,11 @@ import com.diagbot.model.label.DiagLabel;
|
|
|
import com.diagbot.model.label.PresentLabel;
|
|
|
import com.diagbot.rule.AgeRule;
|
|
|
import com.diagbot.rule.SexRule;
|
|
|
-import com.diagbot.rule.*;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.CoreUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
+
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
@@ -86,16 +86,16 @@ public class BillProcess {
|
|
|
// CoreUtil.addBeanToList(billMsgList, billMsg_disease);
|
|
|
|
|
|
// //化验
|
|
|
- BillMsg lisMsg = LisRule.compareLisWithBill(bill.getLis(), lis, bill.getName());
|
|
|
- CoreUtil.addBeanToList(billMsgList, lisMsg);
|
|
|
+ // BillMsg lisMsg = LisRule.compareLisWithBill(bill.getLis(), lis, bill.getName());
|
|
|
+ // CoreUtil.addBeanToList(billMsgList, lisMsg);
|
|
|
+ // //
|
|
|
+ // //辅检
|
|
|
+ // BillMsg pacsMsg = PacsRule.comparePacsWithBill(bill.getPacs(), pacs, bill.getName());
|
|
|
+ // CoreUtil.addBeanToList(billMsgList, pacsMsg);
|
|
|
//
|
|
|
- //辅检
|
|
|
- BillMsg pacsMsg = PacsRule.comparePacsWithBill(bill.getPacs(), pacs, bill.getName());
|
|
|
- CoreUtil.addBeanToList(billMsgList, pacsMsg);
|
|
|
-
|
|
|
- //临床表现
|
|
|
- BillMsg clinicalMsg = DiagRule.compareDiseaseWithBill(bill.getClinicfindings(), clinicals, bill.getName());
|
|
|
- CoreUtil.addBeanToList(billMsgList, clinicalMsg);
|
|
|
+ // //临床表现
|
|
|
+ // BillMsg clinicalMsg = DiagRule.compareDiseaseWithBill(bill.getClinicfindings(), clinicals, bill.getName());
|
|
|
+ // CoreUtil.addBeanToList(billMsgList, clinicalMsg);
|
|
|
|
|
|
// 年龄
|
|
|
BillMsg ageMsg = AgeRule.compareAgeWithBill(bill.getAgeNeoDTO(), wordCrfDTO, bill);
|