|
@@ -5,7 +5,7 @@ import com.diagbot.dto.BillMsg;
|
|
import com.diagbot.dto.BillNeoDTO;
|
|
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.SexRule;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
@@ -65,10 +65,12 @@ public class BillProcess {
|
|
List<DrugBillNeoDTO> drugBillNeoDTOList = bill.getDrugBillNeoDTOList();
|
|
List<DrugBillNeoDTO> drugBillNeoDTOList = bill.getDrugBillNeoDTOList();
|
|
for (DrugBillNeoDTO drug : drugBillNeoDTOList) {
|
|
for (DrugBillNeoDTO drug : drugBillNeoDTOList) {
|
|
// 性别
|
|
// 性别
|
|
- BillMsg billMsg = AgeRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
|
|
|
|
|
|
+ BillMsg billMsg = SexRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
|
|
if (billMsg != null) {
|
|
if (billMsg != null) {
|
|
drugBill.add(billMsg);
|
|
drugBill.add(billMsg);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ // 年龄
|
|
}
|
|
}
|
|
}
|
|
}
|
|
billDTO.setDrugBill(drugBill);
|
|
billDTO.setDrugBill(drugBill);
|