|
@@ -122,12 +122,21 @@ public class SampleLisController {
|
|
|
@Operation(summary = "获取字典", description = "type说明:LIS_SEX性别 LIS_SAMPLE_TYPE样本类型 LIS_PET_TYPE动物类型 ")
|
|
|
@GetMapping("/dict")
|
|
|
public R<List<DictItem>> getLisDict(@RequestParam String type) {
|
|
|
- String sql = "select sub_class_no, sub_class_name from dbo.HT_BAS_DICT where class_no=%s and status=1 ";
|
|
|
- sql = String.format(sql, LisDictType.valueOf(type).getClassNo());
|
|
|
+ LisDictType lisDictType = LisDictType.valueOf(type);
|
|
|
+
|
|
|
+ String sql;
|
|
|
+ if (lisDictType == LisDictType.LIS_SAMPLE_TYPE) {
|
|
|
+ //如果是标本类型,需要特殊处理
|
|
|
+ sql = "select id, name from dbo.HT_DICT_SAMPLE order by id desc";
|
|
|
+ } else {
|
|
|
+ //查询字典
|
|
|
+ sql = "select sub_class_no as id, sub_class_name as name from dbo.HT_BAS_DICT where class_no=%s and status=1 ";
|
|
|
+ sql = String.format(sql, lisDictType.getClassNo());
|
|
|
+ }
|
|
|
|
|
|
List<Entity> entities = lisDb.query(sql);
|
|
|
List<DictItem> dictItems = entities.stream()
|
|
|
- .map(entity -> new DictItem(entity.getInt("sub_class_no"), entity.getStr("sub_class_name")))
|
|
|
+ .map(entity -> new DictItem(entity.getInt("id"), entity.getStr("name")))
|
|
|
.collect(Collectors.toList());
|
|
|
return R.ok(dictItems);
|
|
|
}
|