|
@@ -49,6 +49,8 @@ public class NeoFacade {
|
|
@Autowired
|
|
@Autowired
|
|
DiseaseRepository diseaseRepository;
|
|
DiseaseRepository diseaseRepository;
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ ICDDiseaseRepository icdDiseaseRepository;
|
|
|
|
+ @Autowired
|
|
MedicineCodeRepository medicineCodeRepository;
|
|
MedicineCodeRepository medicineCodeRepository;
|
|
@Autowired
|
|
@Autowired
|
|
ChiefPresentSimilarityServiceClient chiefPresentSimilarityServiceClient;
|
|
ChiefPresentSimilarityServiceClient chiefPresentSimilarityServiceClient;
|
|
@@ -101,9 +103,10 @@ public class NeoFacade {
|
|
public Map<String, List<String>> getSimilarCache() {
|
|
public Map<String, List<String>> getSimilarCache() {
|
|
Map<String, List<String>> res = new HashMap<>();
|
|
Map<String, List<String>> res = new HashMap<>();
|
|
// 临床表现,诊断,化验,辅检,药品,查体,手术
|
|
// 临床表现,诊断,化验,辅检,药品,查体,手术
|
|
|
|
+ res.put(StandConvertEnum.disease.getName(), getDiseaseList());
|
|
// TODO 测试数据
|
|
// TODO 测试数据
|
|
res.put(StandConvertEnum.clinical.getName(), Arrays.asList("胸痛","咳嗽"));
|
|
res.put(StandConvertEnum.clinical.getName(), Arrays.asList("胸痛","咳嗽"));
|
|
- res.put(StandConvertEnum.disease.getName(), Arrays.asList("高血压", "糖尿病"));
|
|
|
|
|
|
+// res.put(StandConvertEnum.disease.getName(), Arrays.asList("高血压", "糖尿病"));
|
|
return res;
|
|
return res;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -132,9 +135,6 @@ public class NeoFacade {
|
|
billNeoDTOs.addAll(getLisDetailBill(billNeoVO.getLisDetailList()));
|
|
billNeoDTOs.addAll(getLisDetailBill(billNeoVO.getLisDetailList()));
|
|
billNeoDTOs.addAll(getLisBill(billNeoVO.getLisList()));
|
|
billNeoDTOs.addAll(getLisBill(billNeoVO.getLisList()));
|
|
|
|
|
|
- // for (BillNeoDTO billNeoDTO:billNeoDTOs) {
|
|
|
|
- // System.out.println(billNeoDTO);
|
|
|
|
- // }
|
|
|
|
return billNeoDTOs;
|
|
return billNeoDTOs;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -144,34 +144,9 @@ public class NeoFacade {
|
|
* 处理处方开单合理性
|
|
* 处理处方开单合理性
|
|
*/
|
|
*/
|
|
public List<BillNeoDTO> getDrugBill(Map<String, String> medsterm) {
|
|
public List<BillNeoDTO> getDrugBill(Map<String, String> medsterm) {
|
|
- List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
|
|
|
|
- BillNeoDTO billNeoDTO;
|
|
|
|
-
|
|
|
|
- DrugBillNeoDTO drugBillNeoDTO;
|
|
|
|
|
|
|
|
MedicineNode medicineNode = new MedicineNode();
|
|
MedicineNode medicineNode = new MedicineNode();
|
|
- Medicine medicine;
|
|
|
|
- String medname;
|
|
|
|
-
|
|
|
|
- for (String term : medsterm.keySet()) {
|
|
|
|
- billNeoDTO = new BillNeoDTO();
|
|
|
|
- medname = medsterm.get(term);
|
|
|
|
- billNeoDTO.setName(term);
|
|
|
|
- billNeoDTO.setStandname(medname);
|
|
|
|
-
|
|
|
|
- drugBillNeoDTO = new DrugBillNeoDTO();
|
|
|
|
-
|
|
|
|
- medicine = medicineRepository.findByNameIs(medname);
|
|
|
|
-
|
|
|
|
- if (medicine != null) {
|
|
|
|
- drugBillNeoDTO = medicineNode.MedicinetoDrugDTO(medicine);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- billNeoDTO.setDrugBillNeoDTO(drugBillNeoDTO);
|
|
|
|
-
|
|
|
|
- billNeoDTOs.add(billNeoDTO);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ List<BillNeoDTO> billNeoDTOs = medicineNode.getDrugBill(medsterm, medicineRepository);
|
|
|
|
|
|
return billNeoDTOs;
|
|
return billNeoDTOs;
|
|
}
|
|
}
|
|
@@ -181,33 +156,9 @@ public class NeoFacade {
|
|
* 处理辅检开单合理性
|
|
* 处理辅检开单合理性
|
|
*/
|
|
*/
|
|
public List<BillNeoDTO> getPacsBill(Map<String, String> pacsterm) {
|
|
public List<BillNeoDTO> getPacsBill(Map<String, String> pacsterm) {
|
|
- List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
|
|
|
|
- BillNeoDTO billNeoDTO;
|
|
|
|
-
|
|
|
|
- PacsBillNeoDTO pacsBillNeoDTO;
|
|
|
|
|
|
|
|
PACSNode pacsNode = new PACSNode();
|
|
PACSNode pacsNode = new PACSNode();
|
|
- PACS pacs;
|
|
|
|
- String pacsname;
|
|
|
|
-
|
|
|
|
- for (String term : pacsterm.keySet()) {
|
|
|
|
- billNeoDTO = new BillNeoDTO();
|
|
|
|
- pacsname = pacsterm.get(term);
|
|
|
|
- billNeoDTO.setName(term);
|
|
|
|
- billNeoDTO.setStandname(pacsname);
|
|
|
|
-
|
|
|
|
- pacsBillNeoDTO = new PacsBillNeoDTO();
|
|
|
|
-
|
|
|
|
- pacs = pacsRepository.findByNameIs(pacsname);
|
|
|
|
-
|
|
|
|
- if (pacs != null) {
|
|
|
|
- pacsBillNeoDTO = pacsNode.PacstoPACSDTO(pacs);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- billNeoDTO.setPacsBillNeoDTO(pacsBillNeoDTO);
|
|
|
|
-
|
|
|
|
- billNeoDTOs.add(billNeoDTO);
|
|
|
|
- }
|
|
|
|
|
|
+ List<BillNeoDTO> billNeoDTOs = pacsNode.getPacsBill(pacsterm, pacsRepository);
|
|
|
|
|
|
return billNeoDTOs;
|
|
return billNeoDTOs;
|
|
}
|
|
}
|
|
@@ -217,33 +168,9 @@ public class NeoFacade {
|
|
* 处理化验套餐开单合理性
|
|
* 处理化验套餐开单合理性
|
|
*/
|
|
*/
|
|
public List<BillNeoDTO> getLisBill(Map<String, String> lispackterm) {
|
|
public List<BillNeoDTO> getLisBill(Map<String, String> lispackterm) {
|
|
- List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
|
|
|
|
- BillNeoDTO billNeoDTO;
|
|
|
|
-
|
|
|
|
- LisBillNeoDTO lisBillNeoDTO;
|
|
|
|
|
|
|
|
LISPackNode lisPackNode = new LISPackNode();
|
|
LISPackNode lisPackNode = new LISPackNode();
|
|
- LISPack lispack;
|
|
|
|
- String lispackname;
|
|
|
|
-
|
|
|
|
- for (String term : lispackterm.keySet()) {
|
|
|
|
- billNeoDTO = new BillNeoDTO();
|
|
|
|
- lispackname = lispackterm.get(term);
|
|
|
|
- billNeoDTO.setName(term);
|
|
|
|
- billNeoDTO.setStandname(lispackname);
|
|
|
|
-
|
|
|
|
- lisBillNeoDTO = new LisBillNeoDTO();
|
|
|
|
-
|
|
|
|
- lispack = lisPackRepository.findByNameIs(lispackname);
|
|
|
|
-
|
|
|
|
- if (lispack != null) {
|
|
|
|
- lisBillNeoDTO = lisPackNode.LisPacktoLISDTO(lispack);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- billNeoDTO.setLisBillNeoDTO(lisBillNeoDTO);
|
|
|
|
-
|
|
|
|
- billNeoDTOs.add(billNeoDTO);
|
|
|
|
- }
|
|
|
|
|
|
+ List<BillNeoDTO> billNeoDTOs = lisPackNode.getLisBill(lispackterm, lisPackRepository);
|
|
|
|
|
|
return billNeoDTOs;
|
|
return billNeoDTOs;
|
|
}
|
|
}
|
|
@@ -253,38 +180,24 @@ public class NeoFacade {
|
|
* 处理化验开单合理性
|
|
* 处理化验开单合理性
|
|
*/
|
|
*/
|
|
public List<BillNeoDTO> getLisDetailBill(Map<String, String> listerm) {
|
|
public List<BillNeoDTO> getLisDetailBill(Map<String, String> listerm) {
|
|
- List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
|
|
|
|
- BillNeoDTO billNeoDTO;
|
|
|
|
-
|
|
|
|
- LisBillNeoDTO lisBillNeoDTO;
|
|
|
|
|
|
|
|
LISNode lisNode = new LISNode();
|
|
LISNode lisNode = new LISNode();
|
|
- LIS lis;
|
|
|
|
- String lisname;
|
|
|
|
-
|
|
|
|
- for (String term : listerm.keySet()) {
|
|
|
|
- billNeoDTO = new BillNeoDTO();
|
|
|
|
- lisname = listerm.get(term);
|
|
|
|
- billNeoDTO.setName(term);
|
|
|
|
- billNeoDTO.setStandname(lisname);
|
|
|
|
|
|
+ List<BillNeoDTO> billNeoDTOs = lisNode.getLisDetailBill(listerm, lisRepository);
|
|
|
|
|
|
- lisBillNeoDTO = new LisBillNeoDTO();
|
|
|
|
-
|
|
|
|
- lis = lisRepository.findByNameIs(lisname);
|
|
|
|
|
|
+ return billNeoDTOs;
|
|
|
|
+ }
|
|
|
|
|
|
- if (lis != null) {
|
|
|
|
- lisBillNeoDTO = lisNode.ListoLISDTO(lis);
|
|
|
|
- }
|
|
|
|
|
|
|
|
- billNeoDTO.setLisBillNeoDTO(lisBillNeoDTO);
|
|
|
|
|
|
+ public List<String> getDiseaseList() {
|
|
|
|
|
|
- billNeoDTOs.add(billNeoDTO);
|
|
|
|
- }
|
|
|
|
|
|
+ ICDDiseaseNode diseaseNode = new ICDDiseaseNode();
|
|
|
|
+ List<String> diseaselist = diseaseNode.getDiseaseNameList(icdDiseaseRepository);
|
|
|
|
|
|
- return billNeoDTOs;
|
|
|
|
|
|
+ return diseaselist;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
public Map<String, PushDTO> getDiag(List<String> diaglist) {
|
|
public Map<String, PushDTO> getDiag(List<String> diaglist) {
|
|
|
|
|
|
Map<String, PushDTO> pushDTOs = new HashMap<>();
|
|
Map<String, PushDTO> pushDTOs = new HashMap<>();
|