bug 737 740

healthlink-his-server/core-common/src/main/java/com/core/common/utils/DictUtils.java

@@ -1,5 +1,6 @@
 package com.core.common.utils;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.core.common.constant.CacheConstants;
@@ -38,11 +39,18 @@ public class DictUtils {
      * @return dictDatas 字典数据列表
      */
     public static List<SysDictData> getDictCache(String key) {
-        JsonNode arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
-        if (StringUtils.isNotNull(arrayCache)) {
-            return new ObjectMapper().convertValue(arrayCache, new com.fasterxml.jackson.core.type.TypeReference<List<SysDictData>>() {});
+        Object cached = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
+        if (StringUtils.isNull(cached)) {
+            return null;
         }
-        return null;
+        com.fasterxml.jackson.core.type.TypeReference<List<SysDictData>> typeRef =
+                new com.fasterxml.jackson.core.type.TypeReference<List<SysDictData>>() {};
+        ObjectMapper mapper = new ObjectMapper()
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        if (cached instanceof JsonNode jsonNode) {
+            return mapper.convertValue(jsonNode, typeRef);
+        }
+        return mapper.convertValue(cached, typeRef);
     }
 
     /**

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java

@@ -182,7 +182,9 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
 
         IPage<InHospitalRegisterQueryDto> inHospitalRegisterInfo = inHospitalRegisterAppMapper
                 .getInHospitalRegisterInfo(new Page<>(pageNo, pageSize), EncounterClass.IMP.getValue(), encounterStatus,
-                        registeredFlag, LocationForm.WARD.getValue(), queryWrapper);
+                        registeredFlag, LocationForm.WARD.getValue(), queryWrapper,
+                        inHospitalRegisterQueryDto.getStartTime(), inHospitalRegisterQueryDto.getEndTime(),
+                        inHospitalRegisterQueryDto.getOrganizationId());
         inHospitalRegisterInfo.getRecords().forEach(e -> {
             // 性别
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java

@@ -100,5 +100,25 @@ public class InHospitalRegisterQueryDto {
      */
     private Integer statusEnum;
 
+    /**
+     * 开始时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /**
+     * 组织ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+
 }
 // PLACEHOLDER_FOR_NEW_FIELDS

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java

@@ -11,6 +11,7 @@ import com.healthlink.his.web.inhospitalcharge.dto.InHospitalRegisterQueryDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -33,7 +34,9 @@ public interface InHospitalRegisterAppMapper {
     IPage<InHospitalRegisterQueryDto> getInHospitalRegisterInfo(@Param("page") Page<InHospitalRegisterQueryDto> page,
         @Param("encounterClass") Integer encounterClass, @Param("encounterStatus") Integer encounterStatus,
         @Param("registeredFlag") String registeredFlag, @Param("formEnum") Integer formEnum,
-        @Param(Constants.WRAPPER) QueryWrapper<InHospitalRegisterQueryDto> queryWrapper);
+        @Param(Constants.WRAPPER) QueryWrapper<InHospitalRegisterQueryDto> queryWrapper,
+        @Param("startTime") Date startTime, @Param("endTime") Date endTime,
+        @Param("organizationId") Long organizationId);
 
     /**
      * 查询患者基本信息

healthlink-his-ui/src/views/doctorstation/components/prescription/prescriptionlist.vue

@@ -394,7 +394,7 @@
                     >
                       皮试：<el-checkbox
                         v-model="scope.row.skinTestFlag"
-                        :true-value="true"
+                        :true-value="1"
                         :false-value="0"
                         @change="handleSkinTestChange(scope.row, scope.rowIndex)"
                       >
@@ -837,7 +837,7 @@
                     >
                       皮试：<el-checkbox
                         v-model="scope.row.skinTestFlag"
-                        :true-value="true"
+                        :true-value="1"
                         :false-value="0"
                         @change="handleSkinTestChange(scope.row, scope.rowIndex)"
                       >
@@ -1332,7 +1332,7 @@
             <template v-if="scope.row.isEdit">
               <el-checkbox
                 v-model="scope.row.skinTestFlag"
-                :true-value="true"
+                :true-value="1"
                 :false-value="0"
                 @change="handleSkinTestChange(scope.row, scope.rowIndex)"
               >