|
@@ -26,15 +26,9 @@ import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.enums.NeoEnum;
|
|
|
import com.diagbot.enums.StatusEnum;
|
|
|
import com.diagbot.enums.TypeEnum;
|
|
|
-import com.diagbot.facade.DiseaseConfigFacade;
|
|
|
-import com.diagbot.facade.DrugConfigFacade;
|
|
|
-import com.diagbot.facade.LisConfigFacade;
|
|
|
-import com.diagbot.facade.OperationConfigFacade;
|
|
|
-import com.diagbot.facade.PacsConfigFacade;
|
|
|
import com.diagbot.facade.RuleConvertFacade;
|
|
|
+import com.diagbot.facade.RunningInfoFacade;
|
|
|
import com.diagbot.facade.SearchDataFacade;
|
|
|
-import com.diagbot.facade.TransfusionConfigFacade;
|
|
|
-import com.diagbot.facade.UnUsedMappingFacade;
|
|
|
import com.diagbot.repository.BillManRepository;
|
|
|
import com.diagbot.repository.LisCriticalRepository;
|
|
|
import com.diagbot.repository.LisRemindRepository;
|
|
@@ -60,9 +54,9 @@ import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.vo.BillRuleVO;
|
|
|
import com.diagbot.vo.CriticalRuleVO;
|
|
|
import com.diagbot.vo.HighriskRuleVO;
|
|
|
-import com.diagbot.vo.HospitalIdVO;
|
|
|
import com.diagbot.vo.IndicationPushVO;
|
|
|
import com.diagbot.vo.OtherRuleVO;
|
|
|
+import com.diagbot.vo.RunningInfoVO;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import io.github.lvyahui8.spring.annotation.DataConsumer;
|
|
|
import io.github.lvyahui8.spring.annotation.DataProvider;
|
|
@@ -111,6 +105,8 @@ public class RuleTestAggregate {
|
|
|
@Autowired
|
|
|
@Qualifier("resultOtherTransfusionServiceImpl")
|
|
|
private ResultOtherTransfusionService resultOtherTransfusionService;
|
|
|
+ @Autowired
|
|
|
+ private RunningInfoFacade runningInfoFacade;
|
|
|
|
|
|
@Autowired
|
|
|
private BillManRepository billManRepository;
|
|
@@ -139,15 +135,6 @@ public class RuleTestAggregate {
|
|
|
|
|
|
@DataProvider("ruleTest")
|
|
|
public Boolean ruleTest(
|
|
|
- /*@InvokeParameter("billRuleVO") BillRuleVO billRuleVO,
|
|
|
- @InvokeParameter("billTransfusionRuleVO") BillRuleVO billTransfusionRuleVO,
|
|
|
- @InvokeParameter("criticalLisRuleVO") CriticalRuleVO criticalLisRuleVO,
|
|
|
- @InvokeParameter("criticalPacsRuleVO") CriticalRuleVO criticalPacsRuleVO,
|
|
|
- @InvokeParameter("highriskDrugRuleVO") HighriskRuleVO highriskDrugRuleVO,
|
|
|
- @InvokeParameter("highriskOperationRuleVO") HighriskRuleVO highriskOperationRuleVO,
|
|
|
- @InvokeParameter("otherLisRuleVO") OtherRuleVO otherLisRuleVO,
|
|
|
- @InvokeParameter("otherPacsRuleVO") OtherRuleVO otherPacsRuleVO,
|
|
|
- @InvokeParameter("otherTransfusionRuleVO") OtherRuleVO otherTransfusionRuleVO,*/
|
|
|
@DataConsumer("billRuleTest") Boolean billRuleTest,
|
|
|
@DataConsumer("billTransfusionRuleTest") Boolean billTransfusionRuleTest,
|
|
|
@DataConsumer("criticalLisRuleTest") Boolean criticalLisRuleTest,
|
|
@@ -175,8 +162,25 @@ public class RuleTestAggregate {
|
|
|
* @param billRuleVO
|
|
|
*/
|
|
|
@DataProvider("billRuleTest")
|
|
|
- @Transactional
|
|
|
public Boolean billRuleTest(@InvokeParameter("billRuleVO") BillRuleVO billRuleVO) {
|
|
|
+ //开始运行
|
|
|
+ RunningInfoVO runningInfoVO = new RunningInfoVO();
|
|
|
+ runningInfoVO.setCaseId(billRuleVO.getCaseId());
|
|
|
+ runningInfoVO.setHospitalId(billRuleVO.getHospitalId());
|
|
|
+ runningInfoVO.setStatus(1);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+
|
|
|
+ billRuleTestExe(billRuleVO);
|
|
|
+
|
|
|
+ //结束运行
|
|
|
+ runningInfoVO.setStatus(0);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional
|
|
|
+ public Boolean billRuleTestExe(BillRuleVO billRuleVO) {
|
|
|
Long hospitalId = billRuleVO.getHospitalId();
|
|
|
|
|
|
List<BillItem> billRules = billManRepository.getAllRules();
|
|
@@ -198,8 +202,24 @@ public class RuleTestAggregate {
|
|
|
* @param billRuleVO
|
|
|
*/
|
|
|
@DataProvider("billTransfusionRuleTest")
|
|
|
- @Transactional
|
|
|
public Boolean billTransfusionRuleTest(@InvokeParameter("billTransfusionRuleVO") BillRuleVO billRuleVO) {
|
|
|
+ //开始运行
|
|
|
+ RunningInfoVO runningInfoVO = new RunningInfoVO();
|
|
|
+ runningInfoVO.setCaseId(billRuleVO.getCaseId());
|
|
|
+ runningInfoVO.setHospitalId(billRuleVO.getHospitalId());
|
|
|
+ runningInfoVO.setStatus(1);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+
|
|
|
+ billTransfusionRuleTestExe(billRuleVO);
|
|
|
+
|
|
|
+ //结束运行
|
|
|
+ runningInfoVO.setStatus(0);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional
|
|
|
+ public Boolean billTransfusionRuleTestExe(BillRuleVO billRuleVO) {
|
|
|
Long hospitalId = billRuleVO.getHospitalId();
|
|
|
List<TransfusionRemind> billRules_transfusion = transfusionRemindRepository.findByStatus(StatusEnum.Enable.getKey());
|
|
|
//生成测试规则
|
|
@@ -220,8 +240,23 @@ public class RuleTestAggregate {
|
|
|
* @param criticalRuleVO
|
|
|
*/
|
|
|
@DataProvider("criticalLisRuleTest")
|
|
|
- @Transactional
|
|
|
public Boolean criticalLisRuleTest(@InvokeParameter("criticalLisRuleVO") CriticalRuleVO criticalRuleVO) {
|
|
|
+ //开始运行
|
|
|
+ RunningInfoVO runningInfoVO = new RunningInfoVO();
|
|
|
+ runningInfoVO.setCaseId(criticalRuleVO.getCaseId());
|
|
|
+ runningInfoVO.setHospitalId(criticalRuleVO.getHospitalId());
|
|
|
+ runningInfoVO.setStatus(1);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+
|
|
|
+ criticalLisRuleTestExe(criticalRuleVO);
|
|
|
+
|
|
|
+ runningInfoVO.setStatus(0);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional
|
|
|
+ public Boolean criticalLisRuleTestExe(CriticalRuleVO criticalRuleVO) {
|
|
|
Long hospitalId = criticalRuleVO.getHospitalId();
|
|
|
List<LisCritical> criticalRules_lis = lisCriticalRepository.findCustomByStatus(StatusEnum.Enable.getKey());
|
|
|
//生成测试规则
|
|
@@ -239,8 +274,23 @@ public class RuleTestAggregate {
|
|
|
* @param criticalRuleVO
|
|
|
*/
|
|
|
@DataProvider("criticalPacsRuleTest")
|
|
|
- @Transactional
|
|
|
public Boolean criticalPacsRuleTest(@InvokeParameter("criticalPacsRuleVO") CriticalRuleVO criticalRuleVO) {
|
|
|
+ //开始运行
|
|
|
+ RunningInfoVO runningInfoVO = new RunningInfoVO();
|
|
|
+ runningInfoVO.setCaseId(criticalRuleVO.getCaseId());
|
|
|
+ runningInfoVO.setHospitalId(criticalRuleVO.getHospitalId());
|
|
|
+ runningInfoVO.setStatus(1);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+
|
|
|
+ criticalPacsRuleTestExe(criticalRuleVO);
|
|
|
+
|
|
|
+ runningInfoVO.setStatus(0);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional
|
|
|
+ public Boolean criticalPacsRuleTestExe(CriticalRuleVO criticalRuleVO) {
|
|
|
Long hospitalId = criticalRuleVO.getHospitalId();
|
|
|
List<PacsCritical> criticalRules_pacs = pacsCriticalRepository.findByStatus(StatusEnum.Enable.getKey());
|
|
|
//生成测试规则
|
|
@@ -258,8 +308,23 @@ public class RuleTestAggregate {
|
|
|
* @return
|
|
|
*/
|
|
|
@DataProvider("highriskDrugRuleTest")
|
|
|
- @Transactional
|
|
|
public Boolean highriskDrugRuleTest(@InvokeParameter("highriskDrugRuleVO") HighriskRuleVO highriskRuleVO) {
|
|
|
+ //开始运行
|
|
|
+ RunningInfoVO runningInfoVO = new RunningInfoVO();
|
|
|
+ runningInfoVO.setCaseId(highriskRuleVO.getCaseId());
|
|
|
+ runningInfoVO.setHospitalId(highriskRuleVO.getHospitalId());
|
|
|
+ runningInfoVO.setStatus(1);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+
|
|
|
+ highriskDrugRuleTestExe(highriskRuleVO);
|
|
|
+
|
|
|
+ runningInfoVO.setStatus(0);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional
|
|
|
+ public Boolean highriskDrugRuleTestExe(HighriskRuleVO highriskRuleVO) {
|
|
|
Long hospitalId = highriskRuleVO.getHospitalId();
|
|
|
List<MedRegName> items = medRegNameRepository.findByStatusAndRisklevelExists(1);
|
|
|
//生成测试规则
|
|
@@ -277,8 +342,23 @@ public class RuleTestAggregate {
|
|
|
* @return
|
|
|
*/
|
|
|
@DataProvider("highriskOperationRuleTest")
|
|
|
- @Transactional
|
|
|
public Boolean highriskOperationRuleTest(@InvokeParameter("highriskOperationRuleVO") HighriskRuleVO highriskRuleVO) {
|
|
|
+ //开始运行
|
|
|
+ RunningInfoVO runningInfoVO = new RunningInfoVO();
|
|
|
+ runningInfoVO.setCaseId(highriskRuleVO.getCaseId());
|
|
|
+ runningInfoVO.setHospitalId(highriskRuleVO.getHospitalId());
|
|
|
+ runningInfoVO.setStatus(1);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+
|
|
|
+ highriskOperationRuleTestExe(highriskRuleVO);
|
|
|
+
|
|
|
+ runningInfoVO.setStatus(0);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional
|
|
|
+ public Boolean highriskOperationRuleTestExe(HighriskRuleVO highriskRuleVO) {
|
|
|
Long hospitalId = highriskRuleVO.getHospitalId();
|
|
|
List<YiBaoOperationName> items = yiBaoOperationNameRepository.findByStatusAndOpgradeExists(1);
|
|
|
//生成测试规则
|
|
@@ -297,8 +377,23 @@ public class RuleTestAggregate {
|
|
|
* @return
|
|
|
*/
|
|
|
@DataProvider("otherLisRuleTest")
|
|
|
- @Transactional
|
|
|
public Boolean otherLisRuleTest(@InvokeParameter("otherLisRuleVO") OtherRuleVO otherRuleVO) {
|
|
|
+ //开始运行
|
|
|
+ RunningInfoVO runningInfoVO = new RunningInfoVO();
|
|
|
+ runningInfoVO.setCaseId(otherRuleVO.getCaseId());
|
|
|
+ runningInfoVO.setHospitalId(otherRuleVO.getHospitalId());
|
|
|
+ runningInfoVO.setStatus(1);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+
|
|
|
+ otherLisRuleTestExe(otherRuleVO);
|
|
|
+
|
|
|
+ runningInfoVO.setStatus(0);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional
|
|
|
+ public Boolean otherLisRuleTestExe(OtherRuleVO otherRuleVO) {
|
|
|
Long hospitalId = otherRuleVO.getHospitalId();
|
|
|
List<LisRemind> items = lisRemindRepository.findByStatus(1);
|
|
|
//生成测试规则
|
|
@@ -317,8 +412,23 @@ public class RuleTestAggregate {
|
|
|
* @return
|
|
|
*/
|
|
|
@DataProvider("otherPacsRuleTest")
|
|
|
- @Transactional
|
|
|
public Boolean otherPacsRuleTest(@InvokeParameter("otherPacsRuleVO") OtherRuleVO otherRuleVO) {
|
|
|
+ //开始运行
|
|
|
+ RunningInfoVO runningInfoVO = new RunningInfoVO();
|
|
|
+ runningInfoVO.setCaseId(otherRuleVO.getCaseId());
|
|
|
+ runningInfoVO.setHospitalId(otherRuleVO.getHospitalId());
|
|
|
+ runningInfoVO.setStatus(1);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+
|
|
|
+ otherPacsRuleTestExe(otherRuleVO);
|
|
|
+
|
|
|
+ runningInfoVO.setStatus(0);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional
|
|
|
+ public Boolean otherPacsRuleTestExe(OtherRuleVO otherRuleVO) {
|
|
|
Long hospitalId = otherRuleVO.getHospitalId();
|
|
|
List<PacsRemind> items = pacsRemindRepository.findByStatus(1);
|
|
|
//生成测试规则
|
|
@@ -337,8 +447,23 @@ public class RuleTestAggregate {
|
|
|
* @return
|
|
|
*/
|
|
|
@DataProvider("otherTransfusionRuleTest")
|
|
|
- @Transactional
|
|
|
public Boolean otherTransfusionRuleTest(@InvokeParameter("otherTransfusionRuleVO") OtherRuleVO otherRuleVO) {
|
|
|
+ //开始运行
|
|
|
+ RunningInfoVO runningInfoVO = new RunningInfoVO();
|
|
|
+ runningInfoVO.setCaseId(otherRuleVO.getCaseId());
|
|
|
+ runningInfoVO.setHospitalId(otherRuleVO.getHospitalId());
|
|
|
+ runningInfoVO.setStatus(1);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+
|
|
|
+ otherTransfusionRuleTestExe(otherRuleVO);
|
|
|
+
|
|
|
+ runningInfoVO.setStatus(0);
|
|
|
+ runningInfoFacade.updateStatus(runningInfoVO);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional
|
|
|
+ public Boolean otherTransfusionRuleTestExe(OtherRuleVO otherRuleVO) {
|
|
|
Long hospitalId = otherRuleVO.getHospitalId();
|
|
|
List<TransfusionSuggest> items = transfusionSuggestRepository.findByStatus(1);
|
|
|
//生成测试规则
|