zhuchunyun/asd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 处理

Browse Source
This commit is contained in:
朱春云 2025-08-29 14:55:14 +08:00
parent 11ca9dd7d2
commit 95a031138d
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java
View File

@ -707,7 +707,6 @@ public class PatientScriptServiceImpl implements PatientScriptService {
public void scanData() throws IOException, InterruptedException, TemplateException { public void scanData() throws IOException, InterruptedException, TemplateException {
PatientScript patientScript =new PatientScript(); PatientScript patientScript =new PatientScript();
patientScript.setStatus("生成中"); patientScript.setStatus("生成中");
patientScript.setType("noDti");
List<PatientScript> patientScripts = scriptMapper.selectList(patientScript); List<PatientScript> patientScripts = scriptMapper.selectList(patientScript);
if (CollectionUtil.isNotEmpty(patientScripts)){ if (CollectionUtil.isNotEmpty(patientScripts)){
return; return;
@ -724,48 +723,52 @@ public class PatientScriptServiceImpl implements PatientScriptService {
// } // }
PatientScript patientScript2 =new PatientScript(); PatientScript patientScript2 =new PatientScript();
patientScript2.setStatus("待生成"); patientScript2.setStatus("待生成");
patientScript2.setType("noDti");
List<PatientScript> patientScriptList = scriptMapper.selectList(patientScript2); List<PatientScript> patientScriptList = scriptMapper.selectList(patientScript2);
//获取最后一个 //获取最后一个
if (CollectionUtil.isNotEmpty(patientScriptList)){ if (CollectionUtil.isNotEmpty(patientScriptList)){
PatientScript patientScript1 = patientScriptList.get(patientScriptList.size() - 1); PatientScript patientScript1 = patientScriptList.get(patientScriptList.size() - 1);
this.save(patientScript1); if (patientScript1.getType().equals("dti")){
this.saveDti(patientScript1);
}else {
this.save(patientScript1);
}
} }
} }
@Scheduled(cron = "0 0/3 * * * ?") // @Scheduled(cron = "0 0/3 * * * ?")
public void scanDataDti() throws IOException, InterruptedException, TemplateException { // public void scanDataDti() throws IOException, InterruptedException, TemplateException {
PatientScript patientScript =new PatientScript(); // PatientScript patientScript =new PatientScript();
patientScript.setStatus("生成中"); // patientScript.setStatus("生成中");
patientScript.setType("dti"); // patientScript.setType("dti");
List<PatientScript> patientScripts = scriptMapper.selectList(patientScript); // List<PatientScript> patientScripts = scriptMapper.selectList(patientScript);
if (CollectionUtil.isNotEmpty(patientScripts)){ // if (CollectionUtil.isNotEmpty(patientScripts)){
return;
}
// PatientScript patientScript3 =new PatientScript();
// patientScript3.setStatus("生成异常");
// patientScript3.setType("dti");
// List<PatientScript> patientScriptList3 = scriptMapper.selectList(patientScript3);
// //获取最后一个
// if (CollectionUtil.isNotEmpty(patientScriptList3)){
// PatientScript patientScript1 = patientScriptList3.get(patientScriptList3.size() - 1);
// this.saveDti(patientScript1);
// return; // return;
// } // }
PatientScript patientScript2 =new PatientScript(); //// PatientScript patientScript3 =new PatientScript();
patientScript2.setStatus("待生成"); //// patientScript3.setStatus("生成异常");
patientScript2.setType("dti"); //// patientScript3.setType("dti");
List<PatientScript> patientScriptList = scriptMapper.selectList(patientScript2); //// List<PatientScript> patientScriptList3 = scriptMapper.selectList(patientScript3);
//获取最后一个 //// //获取最后一个
if (CollectionUtil.isNotEmpty(patientScriptList)){ //// if (CollectionUtil.isNotEmpty(patientScriptList3)){
PatientScript patientScript1 = patientScriptList.get(patientScriptList.size() - 1); //// PatientScript patientScript1 = patientScriptList3.get(patientScriptList3.size() - 1);
this.saveDti(patientScript1); //// this.saveDti(patientScript1);
} //// return;
//// }
// PatientScript patientScript2 =new PatientScript();
} // patientScript2.setStatus("待生成");
// patientScript2.setType("dti");
// List<PatientScript> patientScriptList = scriptMapper.selectList(patientScript2);
// //获取最后一个
// if (CollectionUtil.isNotEmpty(patientScriptList)){
// PatientScript patientScript1 = patientScriptList.get(patientScriptList.size() - 1);
// this.saveDti(patientScript1);
// }
//
//
// }
@Override @Override
public void exportReport(HttpServletResponse response, Long reportId) throws Exception { public void exportReport(HttpServletResponse response, Long reportId) throws Exception {