clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server 

# Conflicts:
#	src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java
This commit is contained in:
LiJianZhao 2025-04-24 16:23:07 +08:00
parent 7016488a61 28967b32c1
commit 90c4f85851
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java
View File

@ -57,7 +57,14 @@ public class SocialDirectoryController extends BaseController {
// 处理参数为空的情况，这里假设返回一个错误结果 // 处理参数为空的情况，这里假设返回一个错误结果
return error("参数 ver 不能为空"); return error("参数 ver 不能为空");
} }
return success(socialDirectoryService.download(ver, type)); Map<String, Object> result= null;
if(type==1301||type==1302||type==1306){
result =socialDirectoryService.download(ver, type);
return success(result);
}
return error("参数 type 不正确");
} }

23
src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java
View File

@ -34,20 +34,10 @@ public class SocialDirectoryService extends BaseService {
@Autowired @Autowired
private HttpUtil httpUtil; private HttpUtil httpUtil;
@Autowired @Autowired
private Config config;
@Autowired
private FileUtil fileUtil;
@Autowired
private DictoryUtil dictoryUtil; private DictoryUtil dictoryUtil;
@Autowired @Autowired
private SocialDiagnoseService socialDiagnoseService;
@Autowired
private SocialItemService socialItemService;
@Autowired
private SocialDirectoryMapper socialDirectoryMapper; private SocialDirectoryMapper socialDirectoryMapper;
@Autowired @Autowired
private SocialChronicDiseaseService socialChronicDiseaseService;
@Autowired
private SocialDirectoryUpinfoMapper socialDirectoryUpinfoMapper; private SocialDirectoryUpinfoMapper socialDirectoryUpinfoMapper;
@Autowired @Autowired
private SocialDirectoryLimitMapper socialDirectoryLimitMapper; private SocialDirectoryLimitMapper socialDirectoryLimitMapper;
@ -55,18 +45,6 @@ public class SocialDirectoryService extends BaseService {
private SocialDirectorySelfMapper socialDirectorySelfMapper; private SocialDirectorySelfMapper socialDirectorySelfMapper;
@Autowired @Autowired
private SocialDirectoryVersionService socialDirectoryVersionService; private SocialDirectoryVersionService socialDirectoryVersionService;
@Autowired
private SocialIcpcDoctorDiagnoseService socialIcpcDoctorDiagnoseService;
@Autowired
private SocialIcpcExaminationTreatmentService socialIcpcExaminationTreatmentService;
@Autowired
private SocialIcpcSelfPayingService socialIcpcSelfPayingService;
@Autowired
private SocialTcmDiseaseCatalogueService socialTcmDiseaseCatalogueService;
@Autowired
private SocialTcmSyndromeService socialTcmSyndromeService;
@Autowired
private SocialChineseMedicinalGranulaService socialChineseMedicinalGranulaService;
private Logger logger = Logger.getLogger(SocialDirectoryService.class.getName()); private Logger logger = Logger.getLogger(SocialDirectoryService.class.getName());
/* /*
@ -152,6 +130,7 @@ public class SocialDirectoryService extends BaseService {
tmp_map.put(code, socialDirectory); tmp_map.put(code, socialDirectory);
} }
} }
socialDirectoryMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(type, version_name, list.get(0).getVersionName(), list.size()); socialDirectoryVersionService.setSocialDirectoryVersion(type, version_name, list.get(0).getVersionName(), list.size());
return list.get(0).getVersionName(); return list.get(0).getVersionName();
} }