|
@@ -4,12 +4,9 @@ import com.diagbot.dto.BillNeoDTO;
|
|
|
import com.diagbot.dto.DrugBillNeoDTO;
|
|
|
import com.diagbot.dto.DrugInfoDTO;
|
|
|
import com.diagbot.dto.NodeNeoDTO;
|
|
|
-import com.diagbot.entity.node.Age;
|
|
|
-import com.diagbot.entity.node.Disease;
|
|
|
-import com.diagbot.entity.node.Group;
|
|
|
-import com.diagbot.entity.node.MedAllergen;
|
|
|
-import com.diagbot.entity.node.Medicine;
|
|
|
+import com.diagbot.entity.node.*;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
+import com.diagbot.util.NeoUtil;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
@@ -25,7 +22,7 @@ public class MedicineNode {
|
|
|
|
|
|
Set<Age> ages = medicine.getAge();
|
|
|
for (Age age : ages) {
|
|
|
- NodeNeoDTO nodeNeoDTO = fillNodeNeoDTO(age);
|
|
|
+ NodeNeoDTO nodeNeoDTO = NeoUtil.fillNodeNeoDTO(age);
|
|
|
drugBillNeoDTO.setAgeNeoDTO(nodeNeoDTO);
|
|
|
}
|
|
|
|
|
@@ -58,7 +55,7 @@ public class MedicineNode {
|
|
|
return drugBillNeoDTO;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+/*
|
|
|
public NodeNeoDTO fillNodeNeoDTO(Age age) {
|
|
|
NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
|
|
|
Integer range;
|
|
@@ -79,19 +76,20 @@ public class MedicineNode {
|
|
|
|
|
|
return nodeNeoDTO;
|
|
|
}
|
|
|
-
|
|
|
+*/
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 处理处方开单合理性
|
|
|
*/
|
|
|
- public List<BillNeoDTO> getMedicineBill(Map<String, String> medsterm, MedicineRepository medicineRepository) {
|
|
|
+ public List<BillNeoDTO> getMedicineBill(Map<String, String> medsterm, MedicineRepository medicineRepository,
|
|
|
+ MedRegNameRepository medRegNameRepository) {
|
|
|
List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
|
|
|
BillNeoDTO billNeoDTO;
|
|
|
|
|
|
DrugBillNeoDTO drugBillNeoDTO;
|
|
|
|
|
|
- List<Medicine> medicine;
|
|
|
+ List<MedRegName> medRegNames;
|
|
|
String medname;
|
|
|
|
|
|
for (String term : medsterm.keySet()) {
|
|
@@ -102,15 +100,23 @@ public class MedicineNode {
|
|
|
|
|
|
drugBillNeoDTO = new DrugBillNeoDTO();
|
|
|
|
|
|
- medicine = medicineRepository.findByNameIs(medname);
|
|
|
-
|
|
|
- if (medicine != null && medicine.size() > 0) {
|
|
|
- drugBillNeoDTO = MedicinetoDrugDTO(medicine.get(0));
|
|
|
+ List<String> medRegNamels = medicineRepository.findMedRegNamebyMedicine(medname);
|
|
|
|
|
|
- billNeoDTO.setDrugBillNeoDTO(drugBillNeoDTO);
|
|
|
+ for (String mrnames : medRegNamels) {
|
|
|
+ medRegNames = medRegNameRepository.findByNameIs(mrnames);
|
|
|
|
|
|
- billNeoDTOs.add(billNeoDTO);
|
|
|
+ if (medRegNames != null && medRegNames.size() > 0) {
|
|
|
+ MedRegNameNode medRegNameNode = new MedRegNameNode();
|
|
|
+ for (MedRegName medrn : medRegNames) {
|
|
|
+ drugBillNeoDTO = medRegNameNode.MedRegNametoDrugDTO(medrn, drugBillNeoDTO);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+ billNeoDTO.setDrugBillNeoDTO(drugBillNeoDTO);
|
|
|
+
|
|
|
+ billNeoDTOs.add(billNeoDTO);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|