diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java index 00cf9ed..844d495 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java @@ -4,9 +4,13 @@ import com.syjiaer.clinic.server.common.util.DictoryUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.common.vo.Result; import com.syjiaer.clinic.server.controller.BaseController; +import com.syjiaer.clinic.server.entity.social.SocialDiagnose; import com.syjiaer.clinic.server.entity.social.SocialDirectory; +import com.syjiaer.clinic.server.entity.social.SocialItem; import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView; +import com.syjiaer.clinic.server.service.social.SocialDiagnoseService; import com.syjiaer.clinic.server.service.social.SocialDirectoryService; +import com.syjiaer.clinic.server.service.social.SocialItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,6 +34,10 @@ public class SocialDirectoryController extends BaseController { @Autowired private SocialDirectoryService socialDirectoryService; @Autowired + private SocialItemService socialItemService; + @Autowired + private SocialDiagnoseService socialDiagnoseService; + @Autowired private DictoryUtil dictoryUtil; @RequestMapping("search") @@ -62,6 +70,14 @@ public class SocialDirectoryController extends BaseController { result =socialDirectoryService.download(ver, type); return success(result); } + if (type ==1307){ + result =socialDiagnoseService.download(ver); + return success(result); + } + if (type == 1305 || type == 1321){ + result =socialItemService.download(ver); + return success(result); + } return error("参数 type 不正确"); diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java index 12d4070..16e29dd 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java @@ -30,7 +30,7 @@ public class SocialDiagnoseService { @Autowired private SocialDirectoryVersionService socialDirectoryVersionService; - public String download( String version_name) { + public Map download( String version_name) { List tab_list = httpUtil.download(version_name, 1307); DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT); List list = new ArrayList<>(); diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java index 8c4ab64..171cf39 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java @@ -32,7 +32,7 @@ public class SocialItemService { @Autowired private SocialDirectoryVersionService socialDirectoryVersionService; - public String download( String version_name) { + public Map download( String version_name) { List tab_list = httpUtil.download(version_name, 1305); List list = new ArrayList<>(); String value = String.valueOf(1305);