更新手术开单合理性

src/main/java/com/diagbot/facade/NeoFacade.java

@@ -170,11 +170,16 @@ public class NeoFacade {
 
         List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
 
-        billNeoDTOs.addAll(getDrugBill(billNeoVO.getDrugList()));
-        billNeoDTOs.addAll(getPacsBill(billNeoVO.getPacsList()));
-        billNeoDTOs.addAll(getLisDetailBill(billNeoVO.getLisDetailList()));
-        billNeoDTOs.addAll(getLisBill(billNeoVO.getLisList()));
-        billNeoDTOs.addAll(getOperationBill(billNeoVO.getOperationList()));
+        try {
+            billNeoDTOs.addAll(getDrugBill(billNeoVO.getDrugList()));
+            billNeoDTOs.addAll(getPacsBill(billNeoVO.getPacsList()));
+            billNeoDTOs.addAll(getLisDetailBill(billNeoVO.getLisDetailList()));
+            billNeoDTOs.addAll(getLisBill(billNeoVO.getLisList()));
+            billNeoDTOs.addAll(getOperationBill(billNeoVO.getOperationList()));
+        }
+        catch (Exception ex) {
+            ex.printStackTrace();
+        }
 
         return billNeoDTOs;
     }

src/main/java/com/diagbot/repository/OperationNode.java

@@ -13,17 +13,37 @@ import java.util.Map;
 
 public class OperationNode {
 
+
+    public OperationBillNeoDTO OperationtoOperationDTO(Operation operation) {
+        OperationBillNeoDTO opBillNeoDTO = new OperationBillNeoDTO();
+
+        return opBillNeoDTO;
+    }
+
     /**
      * 处理手术开单合理性
      */
-    public List<BillNeoDTO> getOperationBill(Map<String, String> operation, OperationRepository opRepository) {
+    public List<BillNeoDTO> getOperationBill(Map<String, String> opterm, OperationRepository opRepository) {
         List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
         BillNeoDTO billNeoDTO;
 
         OperationBillNeoDTO opBillNeoDTO;
 
-        for (String term : operation.keySet()) {
+        String opname;
+
+        for (String term : opterm.keySet()) {
+            billNeoDTO = new BillNeoDTO();
+            opname = opterm.get(term);
+            billNeoDTO.setName(opname);
+
+            List<Operation> operations = opRepository.findByNameIs(opname);
+
+            if (null!=operations && operations.size()>0) {
+                opBillNeoDTO = OperationtoOperationDTO(operations.get(0));
+                billNeoDTO.setOperationBillNeoDTO(opBillNeoDTO);
+            }
 
+            billNeoDTOs.add(billNeoDTO);
         }
 
         return billNeoDTOs;
@@ -70,12 +90,15 @@ public class OperationNode {
             highRiskNeoDTO.setName(term);
             highRiskNeoDTO.setStandname(opname);
 
-            operation = operationRepository.findByNameIs(opname);
+            List<Operation> operations = operationRepository.findByNameIs(opname);
 
-            if (null != operation && null!=operation.getRisklevel() && operation.getRisklevel().trim().length()>0) {
-                highRiskNeoDTO.setIsHighrisk(true);
-                highRiskNeoDTO.setType("手术");
-                highRiskNeoDTOS.add(highRiskNeoDTO);
+            if (null != operations) {
+                operation = operations.get(0);
+                if (null!=operation.getRisklevel() && operation.getRisklevel().trim().length()>0) {
+                    highRiskNeoDTO.setIsHighrisk(true);
+                    highRiskNeoDTO.setType("手术");
+                    highRiskNeoDTOS.add(highRiskNeoDTO);
+                }
             }
         }
 

src/main/java/com/diagbot/repository/OperationRepository.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface OperationRepository extends Neo4jRepository<Operation, Long> {
 
-    Operation findByNameIs(String name);
+    List<Operation> findByNameIs(String name);
 
     List<Operation> findByNameLike(String name);
 }