疾病目录up

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java

@@ -125,6 +125,8 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
             e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag()));
             // 过敏标记枚举类回显赋值
             e.setAllergenFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getAllergenFlag()));
+            //器材分类
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(DeviceCategory.class, e.getCategoryEnum()));
         });
 
         // 返回【器材目录列表DTO】分页

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java

@@ -9,6 +9,8 @@ import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,8 +23,6 @@ import com.openhis.clinical.domain.ConditionDefinition;
 import com.openhis.clinical.mapper.ConditionDefinitionMapper;
 import com.openhis.clinical.service.IConditionDefinitionService;
 import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.ConditionDefinitionSource;
-import com.openhis.common.enums.PublicationStatus;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.datadictionary.dto.DiseaseManageDto;
@@ -65,6 +65,7 @@ public class DiseaseManageController {
             .map(status -> new DiseaseManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
             .collect(Collectors.toList());
         diseaseManageInitDto.setStatusFlagOptions(statusEnumOptions);
+
         return R.ok(diseaseManageInitDto);
     }
 
@@ -91,6 +92,14 @@ public class DiseaseManageController {
         // 分页查询
         Page<DiseaseManageDto> diseasePage =
             HisPageUtils.selectPage(conditionDefinitionMapper, queryWrapper, pageNo, pageSize, DiseaseManageDto.class);
+
+        diseasePage.getRecords().forEach(e -> {
+            // 医保对码枚举类回显赋值
+            e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag()));
+            //状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum()));
+        });
+
         // 返回【病种目录列表DTO】分页
         return R.ok(diseasePage);
     }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java

@@ -36,7 +36,8 @@ public class DeviceManageDto {
     private String wbStr;
 
     /** 器材分类 */
-    private DeviceCategory categoryEnum;
+    private Integer categoryEnum;
+    private String categoryEnum_enumText;
 
     /** 器材种类 */
     private String typeCode;

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java

@@ -50,8 +50,10 @@ public class DiseaseManageDto {
 
     /** 医保对码标记 */
     private Integer ybMatchFlag;
+    private String ybMatchFlag_enumText;
 
     /** 状态 */
-    private PublicationStatus statusEnum;
+    private Integer statusEnum;
+    private String statusEnum_enumText;
 
 }

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java

@@ -6,7 +6,7 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum DeviceCategory {
+public enum DeviceCategory implements HisEnumInterface  {
     ACTIVE (1, "active", "有源的"),
     COMMUNICATING(2, "communicating", "通讯类"),
     HOMEUSE(3, "communicating", "非院内使用"),