Revert "更新查询节点的方法，只查询状态为1的节点"

This reverts commit d433320a

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

@@ -124,7 +124,7 @@ public class CombiOperationNode {
 				billNeoDTO.setName(term);
 				billNeoDTO.setStandname(opname);
 
-				oplist = combiRepository.findByNameAndStatus(opname, 1);
+				oplist = combiRepository.findByNameIs(opname);
 
 				if (ListUtil.isNotEmpty(oplist)) {
 					combiOpBillNeoDTO = CombiOptoCombiOpDTO(oplist.get(0));

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

@@ -11,7 +11,5 @@ public interface CombiOperationRepository extends Neo4jRepository<CombiOperation
     List<CombiOperation> findByNameContaining(String name);
 
     List<CombiOperation> findByNameIs(String name);
-
-    List<CombiOperation> findByNameAndStatus(String name, Integer status);
 }
 

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

@@ -36,6 +36,6 @@ public interface DeptRepository extends Neo4jRepository<Dept, Long> {
     List<Dept> index(@Param("name") String name, @Param("pycode") String pycode, @Param("size") Integer size);
 
 
-    @Query("MATCH (n:科室) WHERE NOT EXISTS(n.状态) OR n.状态=1 return distinct(n.name) as name LIMIT $(size)")
+    @Query("MATCH (n:科室) return distinct(n.name) as name LIMIT $(size)")
     List<String> getDeptNames(@Param("size") Integer size);
 }

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

@@ -160,7 +160,7 @@ public class LisNameNode {
 
 				lisBillNeoDTO = new LisBillNeoDTO();
 
-				lislist = lisRepository.findByNameAndStatus(lisname, 1);
+				lislist = lisRepository.findByNameIs(lisname);
 
 				if (ListUtil.isNotEmpty(lislist)) {
 					lisBillNeoDTO = ListoLISDTO(lislist.get(0));
@@ -290,7 +290,7 @@ public class LisNameNode {
 				String name = lisvo.getUniqueName();
 
 				if (StringUtil.isNotBlank(name)) {
-					List<LisName> lislt = lisRepository.findByNameAndStatus(name, 1);
+					List<LisName> lislt = lisRepository.findByNameIs(name);
 
 					for (LisName lis : lislt) {
 						criticalNeoDTO = new CriticalNeoDTO();
@@ -355,7 +355,7 @@ public class LisNameNode {
 		neoEntityDTO.setName(name);
 
 		try {
-			List<LisName> lisres = lisRepository.findByNameAndStatus(name, 1);
+			List<LisName> lisres = lisRepository.findByNameIs(name);
 
 			if (lisres != null && lisres.size() > 0) {
 				LisName lis = lisres.get(0);

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

@@ -14,8 +14,6 @@ public interface LisNameRepository extends Neo4jRepository<LisName, Long> {
 
     List<LisName> findByNameIs(String name);
 
-    List<LisName> findByNameAndStatus(String name, Integer status);
-
     List<LisName> findByNameContaining(String name);
 
     List<LisName> findByNameIn(List<String> names);
@@ -52,6 +50,6 @@ public interface LisNameRepository extends Neo4jRepository<LisName, Long> {
             "RETURN n,[ (n)-[r]->(m) | [ r, m ] ], ID(n)\n")
     List<LisName> index(@Param("name") String name, @Param("pycode") String pycode, @Param("size") Integer size);
 
-    @Query("MATCH (n:实验室检查名称) WHERE NOT EXISTS(n.状态) OR n.状态=1 RETURN DISTINCT n.name as name LIMIT {size}")
+    @Query("MATCH (n:实验室检查名称) RETURN DISTINCT n.name as name LIMIT {size}")
     List<String> getname(@Param("size") Integer size);
 }

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

@@ -136,7 +136,7 @@ public class LisSetNode {
 
 				lisBillNeoDTO = new LisBillNeoDTO();
 
-				lisSetlist = lisSetRepository.findByNameAndStatus(lissetname, 1);
+				lisSetlist = lisSetRepository.findByNameIs(lissetname);
 
 				if (ListUtil.isNotEmpty(lisSetlist)) {
 					lisBillNeoDTO = LisPacktoLISDTO(lisSetlist.get(0));
@@ -209,7 +209,7 @@ public class LisSetNode {
 		neoEntityDTO.setName(name);
 
 		try {
-			List<LisSet> lisSetres = lisPackRepository.findByNameAndStatus(name, 1);
+			List<LisSet> lisSetres = lisPackRepository.findByNameIs(name);
 
 			if (lisSetres != null && lisSetres.size() > 0) {
 				LisSet lisSet = lisSetres.get(0);

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

@@ -14,8 +14,6 @@ public interface LisSetRepository extends Neo4jRepository<LisSet, Long> {
 
     List<LisSet> findByNameIs(String name);
 
-    List<LisSet> findByNameAndStatus(String name, Integer status);
-
     List<LisSet> findByNameContaining(String name);
 
     List<LisSet> findByNameIn(List<String> names);
@@ -52,7 +50,7 @@ public interface LisSetRepository extends Neo4jRepository<LisSet, Long> {
             "RETURN n,[ (n)-[r]->(m) | [ r, m ] ], ID(n)\n")
     List<LisSet> index(@Param("name") String name, @Param("pycode") String pycode, @Param("size") Integer size);
 
-    @Query("MATCH (n:实验室检查套餐名) WHERE NOT EXISTS(n.状态) OR n.状态=1 RETURN DISTINCT(n.name) LIMIT {size}")
+    @Query("MATCH (n:实验室检查套餐名) RETURN DISTINCT(n.name) LIMIT {size}")
     List<String> getname(@Param("size") Integer size);
 }
 

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

@@ -38,7 +38,7 @@ public class MedRegNameNode {
             highRiskNeoDTO.setStandname(drugname);
             drugform = drug.getForm();
 
-            medicine = medRepository.findByNameAndStatus(drugname, 1);
+            medicine = medRepository.findByNameIs(drugname);
 
             if (null != medicine) {
                 for (Medicine med: medicine) {
@@ -46,7 +46,7 @@ public class MedRegNameNode {
                         if (NeoUtil.isExist(medCodeMed)) {
                             MedCodeName medcdname = medCodeMed.getMedCodeName();
                             if (NeoUtil.isExist(medcdname) && medcdname.getReg_JiXin().equals(drugform)) {
-                                medcdnames = medCodeRepository.findByNameAndStatus(medcdname.getName(), 1);
+                                medcdnames = medCodeRepository.findByNameIs(medcdname.getName());
                                 for (MedCodeName medcdnm : medcdnames) {
                                     for (MedCodeNameMedRegName medCodeMedReg : medcdnm.getMedCodeNameMedregnames()) {
                                         if (NeoUtil.isExist(medCodeMedReg)) {

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

@@ -284,7 +284,7 @@ public class MedicineCodeNode {
 
             drugBillNeoDTO = new DrugBillNeoDTO();
 
-            medicine = medicineRepository.findByNameAndStatus(medname, 1);
+            medicine = medicineRepository.findByNameIs(medname);
 
             if (medicine != null && medicine.size() > 0) {
                 drugBillNeoDTO = MedicinetoDrugDTO(medicine.get(0));
@@ -324,5 +324,37 @@ 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;
+    }
 }
 

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

@@ -12,8 +12,6 @@ public interface MedicineCodeRepository extends Neo4jRepository<MedCodeName, Lon
 
     List<MedCodeName> findByNameIs(String name);
 
-    List<MedCodeName> findByNameAndStatus(String name, Integer status);
-
     List<MedCodeName> findByNameContaining(String name);
 }
 

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

@@ -14,8 +14,6 @@ public interface MedicineRepository extends Neo4jRepository<Medicine, Long> {
 
     List<Medicine> findByNameIs(String name);
 
-    List<Medicine> findByNameAndStatus(String name, Integer status);
-
     List<Medicine> findByNameContaining(String name);
 
     List<Medicine> findByNameIn(List<String> names);
@@ -57,6 +55,6 @@ public interface MedicineRepository extends Neo4jRepository<Medicine, Long> {
             "RETURN n,[ (n)-[r]->(m) | [ r, m ] ], ID(n)\n")
     List<Medicine> index(@Param("name") String name, @Param("pycode") String pycode, @Param("size") Integer size);
 
-    @Query("MATCH (n:药品通用名称) WHERE NOT EXISTS(n.状态) OR n.状态=1 RETURN DISTINCT n.name as name LIMIT $size")
+    @Query("MATCH (n:药品通用名称) RETURN DISTINCT n.name as name LIMIT $size")
     List<String> getMedicineNames(@Param("size") Integer size);
 }

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

@@ -91,7 +91,7 @@ public interface PacsNameRepository extends Neo4jRepository<PacsName, Long> {
     List<BaseNodeInfo> findByNameInMultipleLabel(@Param("names") List<String> names);
 
 
-    @Query("MATCH (n) WHERE (n:辅助检查名称 OR n:辅助检查子项目名称) AND (NOT EXISTS(n.状态) OR n.状态=1) \n" +
+    @Query("MATCH (n) WHERE (n:辅助检查名称 OR n:辅助检查子项目名称)\n" +
             "RETURN DISTINCT n.name as name LIMIT {size}\n")
     List<String> getPACSNames(@Param("size") Integer size);
 }

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

@@ -179,7 +179,7 @@ public class PacsSubNameNode {
 
                 pacsBillNeoDTO = new PacsBillNeoDTO();
 
-                pacslt = pacsSubRepository.findByNameAndStatus(pacsname, 1);
+                pacslt = pacsSubRepository.findByNameIs(pacsname);
 
                 if (pacslt != null && pacslt.size() > 0) {
                     pacsBillNeoDTO = PacstoPACSDTO(pacslt.get(0));

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

@@ -12,8 +12,6 @@ public interface PacsSubNameRepository extends Neo4jRepository<PacsSubName, Long
 
     List<PacsSubName> findByNameIs(String name);
 
-    List<PacsSubName> findByNameAndStatus(String name, Integer status);
-
     List<PacsSubName> findByNameContaining(String name);
 
     List<PacsSubName> findByNameIn(List<String> names);

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

@@ -42,8 +42,7 @@ public interface SymptomNameRepository extends Neo4jRepository<Symptom, Long> {
     @Query("match(d:医保疾病名称)-[r:医保疾病名称相关体征]->(s:体征) where s.name in {py} return d.name")
     List<String> getDisByVital(@Param("py")List<String> vitals);
 
-    @Query("MATCH (n:症状) WHERE NOT EXISTS(n.状态) OR n.状态=1 " +
-            "return distinct(n.name) as name LIMIT {size}")
+    @Query("MATCH (n:症状) return distinct(n.name) as name LIMIT {size}")
     List<String> getSymptomNames(@Param("size") Integer size);
 }
 

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

@@ -33,7 +33,7 @@ public interface VitalRepository extends Neo4jRepository<Vital, Long> {
     List<Vital> index(@Param("name") String name, @Param("pycode") String pycode, @Param("size") Integer size);
 
 
-    @Query("MATCH (n:体征) WHERE NOT EXISTS(n.状态) OR n.状态=1 return distinct(n.name) as name LIMIT {size}")
+    @Query("MATCH (n:体征) return distinct(n.name) as name LIMIT {size}")
     List<String> getVitalNames(@Param("size") Integer size);
 
 }

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

@@ -51,8 +51,7 @@ public interface YiBaoDiseaseNameRepository extends Neo4jRepository<YiBaoDisease
     List<YiBaoDiseaseName> index(@Param("name") String name, @Param("pycode") String pycode, @Param("size") Integer size);
 
 
-    @Query("MATCH (n:医保疾病名称) NOT EXISTS(n.状态) OR n.状态=1 " +
-            "RETURN DISTINCT n.name as name LIMIT {size}")
+    @Query("MATCH (n:医保疾病名称) RETURN DISTINCT n.name as name LIMIT {size}")
     List<String> getDiseaseNames(@Param("size") Integer size);
 }
 

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

@@ -265,7 +265,7 @@ public class YiBaoOperationNameNode {
             highRiskNeoDTO.setName(term);
             highRiskNeoDTO.setStandname(opname);
 
-            List<YiBaoOperationName> operations = operationRepository.findByNameAndStatus(opname,1);
+            List<YiBaoOperationName> operations = operationRepository.findByNameIs(opname);
 
             if (ListUtil.isNotEmpty(operations)) {
                 operation = operations.get(0);

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

@@ -14,8 +14,6 @@ public interface YiBaoOperationNameRepository extends Neo4jRepository<YiBaoOpera
 
     List<YiBaoOperationName> findByNameIs(String name);
 
-    List<YiBaoOperationName> findByNameAndStatus(String name, Integer status);
-
     List<YiBaoOperationName> findByNameContaining(String name);
 
     List<YiBaoOperationName> findByNameIn(List<String> names);