|
@@ -9,23 +9,10 @@ import com.diagbot.dto.LisBillNeoDTO;
|
|
import com.diagbot.dto.PacsBillNeoDTO;
|
|
import com.diagbot.dto.PacsBillNeoDTO;
|
|
import com.diagbot.dto.PushDTO;
|
|
import com.diagbot.dto.PushDTO;
|
|
import com.diagbot.dto.StandConvertCrfDTO;
|
|
import com.diagbot.dto.StandConvertCrfDTO;
|
|
-import com.diagbot.entity.node.Disease;
|
|
|
|
-import com.diagbot.entity.node.LIS;
|
|
|
|
-import com.diagbot.entity.node.Medicine;
|
|
|
|
-import com.diagbot.entity.node.Medicine_Code;
|
|
|
|
-import com.diagbot.entity.node.OralMedicine;
|
|
|
|
-import com.diagbot.entity.node.PACS;
|
|
|
|
|
|
+import com.diagbot.entity.node.*;
|
|
import com.diagbot.enums.StandConvertEnum;
|
|
import com.diagbot.enums.StandConvertEnum;
|
|
import com.diagbot.model.ai.ModelAI;
|
|
import com.diagbot.model.ai.ModelAI;
|
|
-import com.diagbot.repository.DiseaseNode;
|
|
|
|
-import com.diagbot.repository.DiseaseRepository;
|
|
|
|
-import com.diagbot.repository.LISNode;
|
|
|
|
-import com.diagbot.repository.LisRepository;
|
|
|
|
-import com.diagbot.repository.MedicineCodeRepository;
|
|
|
|
-import com.diagbot.repository.MedicineNode;
|
|
|
|
-import com.diagbot.repository.MedicineRepository;
|
|
|
|
-import com.diagbot.repository.PACSNode;
|
|
|
|
-import com.diagbot.repository.PacsRepository;
|
|
|
|
|
|
+import com.diagbot.repository.*;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.vo.BillNeoVO;
|
|
import com.diagbot.vo.BillNeoVO;
|
|
import com.diagbot.vo.PushNeoVO;
|
|
import com.diagbot.vo.PushNeoVO;
|
|
@@ -58,6 +45,8 @@ public class NeoFacade {
|
|
@Autowired
|
|
@Autowired
|
|
LisRepository lisRepository;
|
|
LisRepository lisRepository;
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ LisPackRepository lisPackRepository;
|
|
|
|
+ @Autowired
|
|
DiseaseRepository diseaseRepository;
|
|
DiseaseRepository diseaseRepository;
|
|
@Autowired
|
|
@Autowired
|
|
MedicineCodeRepository medicineCodeRepository;
|
|
MedicineCodeRepository medicineCodeRepository;
|
|
@@ -140,6 +129,7 @@ public class NeoFacade {
|
|
|
|
|
|
billNeoDTOs.addAll(getDrugBill(billNeoVO.getDrugList()));
|
|
billNeoDTOs.addAll(getDrugBill(billNeoVO.getDrugList()));
|
|
billNeoDTOs.addAll(getPacsBill(billNeoVO.getPacsList()));
|
|
billNeoDTOs.addAll(getPacsBill(billNeoVO.getPacsList()));
|
|
|
|
+ billNeoDTOs.addAll(getLisDetailBill(billNeoVO.getLisDetailList()));
|
|
billNeoDTOs.addAll(getLisBill(billNeoVO.getLisList()));
|
|
billNeoDTOs.addAll(getLisBill(billNeoVO.getLisList()));
|
|
|
|
|
|
for (BillNeoDTO billNeoDTO:billNeoDTOs) {
|
|
for (BillNeoDTO billNeoDTO:billNeoDTOs) {
|
|
@@ -223,10 +213,46 @@ public class NeoFacade {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 处理化验套餐开单合理性
|
|
|
|
+ */
|
|
|
|
+ public List<BillNeoDTO> getLisBill(Map<String, String> lispackterm) {
|
|
|
|
+ List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
|
|
|
|
+ BillNeoDTO billNeoDTO;
|
|
|
|
+
|
|
|
|
+ LisBillNeoDTO lisBillNeoDTO;
|
|
|
|
+
|
|
|
|
+ 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);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return billNeoDTOs;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 处理化验开单合理性
|
|
* 处理化验开单合理性
|
|
*/
|
|
*/
|
|
- public List<BillNeoDTO> getLisBill(Map<String, String> listerm) {
|
|
|
|
|
|
+ public List<BillNeoDTO> getLisDetailBill(Map<String, String> listerm) {
|
|
List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
|
|
List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
|
|
BillNeoDTO billNeoDTO;
|
|
BillNeoDTO billNeoDTO;
|
|
|
|
|