|
@@ -284,7 +284,7 @@ public class MedicineCodeNode {
|
|
|
|
|
|
drugBillNeoDTO = new DrugBillNeoDTO();
|
|
|
|
|
|
- medicine = medicineRepository.findByNameIs(medname);
|
|
|
+ medicine = medicineRepository.findByNameAndStatus(medname, 1);
|
|
|
|
|
|
if (medicine != null && medicine.size() > 0) {
|
|
|
drugBillNeoDTO = MedicinetoDrugDTO(medicine.get(0));
|
|
@@ -324,37 +324,5 @@ public class MedicineCodeNode {
|
|
|
}
|
|
|
|
|
|
|
|
|
- /**
|
|
|
- * 获取高危药品数据
|
|
|
- */
|
|
|
- public List<HighRiskNeoDTO> getHighRiskDrug(Map<String, String> drugsterm, MedicineCodeRepository medicineRepository) {
|
|
|
- List<HighRiskNeoDTO> highRiskNeoDTOS = new ArrayList<>();
|
|
|
- HighRiskNeoDTO highRiskNeoDTO;
|
|
|
- String drugname;
|
|
|
- List<Medicine> medicine;
|
|
|
- Medicine med;
|
|
|
-/*
|
|
|
- for (String term : drugsterm.keySet()) {
|
|
|
- highRiskNeoDTO = new HighRiskNeoDTO();
|
|
|
-
|
|
|
- drugname = drugsterm.get(term);
|
|
|
- highRiskNeoDTO.setName(term);
|
|
|
- highRiskNeoDTO.setStandname(drugname);
|
|
|
-
|
|
|
- medicine = medicineRepository.findByNameIs(drugname);
|
|
|
-
|
|
|
- if (null != medicine && medicine.size()>0) {
|
|
|
- med = medicine.get(0);
|
|
|
-
|
|
|
- if (null!=med.getRisklevel() && med.getRisklevel().trim().length()>0) {
|
|
|
- highRiskNeoDTO.setIsHighrisk(true);
|
|
|
- highRiskNeoDTO.setType("药品");
|
|
|
- highRiskNeoDTOS.add(highRiskNeoDTO);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-*/
|
|
|
- return highRiskNeoDTOS;
|
|
|
- }
|
|
|
}
|
|
|
|