|
@@ -17,6 +17,7 @@ import com.lantone.qc.dbanaly.lt.service.impl.AbnormalServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.BehospitalInfoServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.BehospitalInfoServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.MedicalRecordContentServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.MedicalRecordContentServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.MedicalRecordServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.MedicalRecordServiceImpl;
|
|
|
|
+import com.lantone.qc.dbanaly.lt.service.impl.ModelHospitalServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.RecordAnalyzeDetailServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.RecordAnalyzeDetailServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.RecordAnalyzeExampleServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.RecordAnalyzeExampleServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.RecordAnalyzeServiceImpl;
|
|
import com.lantone.qc.dbanaly.lt.service.impl.RecordAnalyzeServiceImpl;
|
|
@@ -64,6 +65,9 @@ public class XmlDataAnalysisFacade {
|
|
@Autowired
|
|
@Autowired
|
|
@Qualifier("abnormalServiceImpl")
|
|
@Qualifier("abnormalServiceImpl")
|
|
private AbnormalServiceImpl abnormalService;
|
|
private AbnormalServiceImpl abnormalService;
|
|
|
|
+ @Autowired
|
|
|
|
+ @Qualifier("modelHospitalServiceImpl")
|
|
|
|
+ private ModelHospitalServiceImpl modelHospitalService;
|
|
@Value("${xml-is-encryped}")
|
|
@Value("${xml-is-encryped}")
|
|
private boolean encryped;
|
|
private boolean encryped;
|
|
|
|
|
|
@@ -78,7 +82,7 @@ public class XmlDataAnalysisFacade {
|
|
}
|
|
}
|
|
|
|
|
|
@Transactional(transactionManager = "db1TransactionManager")
|
|
@Transactional(transactionManager = "db1TransactionManager")
|
|
- public void analysisByRecTitle(long hospitalId, long modelId, String modeName, String recTitle, String sex) throws Exception {
|
|
|
|
|
|
+ public void analysisByRecTitle(long hospitalId, long modelId, String modeName, String recTitle, List<String> excludeRecTitles, String sex) throws Exception {
|
|
//找出未处理的文书记录
|
|
//找出未处理的文书记录
|
|
QueryWrapper<MedicalRecord> medicalRecordQe = new QueryWrapper<>();
|
|
QueryWrapper<MedicalRecord> medicalRecordQe = new QueryWrapper<>();
|
|
medicalRecordQe.eq("hospital_id", hospitalId);
|
|
medicalRecordQe.eq("hospital_id", hospitalId);
|
|
@@ -86,6 +90,7 @@ public class XmlDataAnalysisFacade {
|
|
medicalRecordQe.eq("status", 0);
|
|
medicalRecordQe.eq("status", 0);
|
|
medicalRecordQe.eq("is_deleted", "N");
|
|
medicalRecordQe.eq("is_deleted", "N");
|
|
medicalRecordQe.eq(StringUtil.isNotBlank(recTitle), "rec_title", recTitle);
|
|
medicalRecordQe.eq(StringUtil.isNotBlank(recTitle), "rec_title", recTitle);
|
|
|
|
+ medicalRecordQe.notIn(ListUtil.isNotEmpty(excludeRecTitles), "rec_title", excludeRecTitles);
|
|
medicalRecordQe.select("rec_id", "behospital_code");
|
|
medicalRecordQe.select("rec_id", "behospital_code");
|
|
List<MedicalRecord> medicalRecordList = medicalRecordService.list(medicalRecordQe);
|
|
List<MedicalRecord> medicalRecordList = medicalRecordService.list(medicalRecordQe);
|
|
if (ListUtil.isEmpty(medicalRecordList)) {
|
|
if (ListUtil.isEmpty(medicalRecordList)) {
|
|
@@ -181,6 +186,7 @@ public class XmlDataAnalysisFacade {
|
|
recordAnalyzeQe.eq("hospital_id", hospitalId);
|
|
recordAnalyzeQe.eq("hospital_id", hospitalId);
|
|
recordAnalyzeQe.eq("mode_id", modelId);
|
|
recordAnalyzeQe.eq("mode_id", modelId);
|
|
recordAnalyzeQe.eq(StringUtil.isNotBlank(recTitle), "rec_type", recTitle);
|
|
recordAnalyzeQe.eq(StringUtil.isNotBlank(recTitle), "rec_type", recTitle);
|
|
|
|
+ recordAnalyzeQe.notIn(ListUtil.isNotEmpty(excludeRecTitles), "rec_type", excludeRecTitles);
|
|
recordAnalyzeQe.like(StringUtil.isNotBlank(sex), "name", sex);
|
|
recordAnalyzeQe.like(StringUtil.isNotBlank(sex), "name", sex);
|
|
recordAnalyzeQe.select("id");
|
|
recordAnalyzeQe.select("id");
|
|
List<Long> recordAnalyzeIds = recordAnalyzeService.list(recordAnalyzeQe).stream().map(i -> i.getId()).collect(Collectors.toList());
|
|
List<Long> recordAnalyzeIds = recordAnalyzeService.list(recordAnalyzeQe).stream().map(i -> i.getId()).collect(Collectors.toList());
|