hellfire 0.27.10 → 0.27.12

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.27.12](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.11...v0.27.12) (2024-04-26)
+
+
+
+## [0.27.11](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.10...v0.27.11) (2024-04-24)
+
+
+
 ## [0.27.10](http://10.16.100.57/diffusion/115/paladin/compare/v0.27.9...v0.27.10) (2024-04-08)
 
 

package/README.md

@@ -151,6 +151,12 @@ disableUpDownKeyAction: boolean
 
 上下热键事件是否禁用
 
+<b>`anonymous`</b>
+```
+anonymous: boolean
+```
+病人信息匿名
+
 ### DicomView提供给父组件调用的方法:
 
 <b>`addStudy(data)`</b>

package/dist/index.js

@@ -898,6 +898,7 @@ var SET_CINE_DIREACTION = 'SET_CINE_DIREACTION';
 var RESET_TOOLS_STATE = 'RESET_TOOLS_STATE';
 var SET_VR_MODE = 'SET_VR_MODE';
 var TOGGLE_MEASURE = 'TOGGLE_MEASURE';
+var SET_MEASURE = 'SET_MEASURE';
 var SET_CENTESIS_PATH = 'SET_CENTESIS_PATH';
 var SET_IO_ON = 'SET_IO_ON';
 var SET_IO_OFF = 'SET_IO_OFF';
@@ -1046,9 +1047,22 @@ var action = (function () {
       }
 
     case TOGGLE_MEASURE:
+      {
+        var _next = !state.continuousMeasure; // 记忆连续测量的值
+
+
+        var _nextStorageValue = _next ? 'open' : 'close';
+
+        window.localStorage.setItem('hellfire-continuous-measure-default-state', _nextStorageValue);
+        return _objectSpread$1(_objectSpread$1({}, state), {}, {
+          continuousMeasure: _next
+        });
+      }
+
+    case SET_MEASURE:
       {
         return _objectSpread$1(_objectSpread$1({}, state), {}, {
-          continuousMeasure: !state.continuousMeasure
+          continuousMeasure: action.payload
         });
       }
 
@@ -1189,6 +1203,12 @@ function toggleMeasure() {
   return {
     type: TOGGLE_MEASURE
   };
+}
+function setMeasure(payload) {
+  return {
+    type: SET_MEASURE,
+    payload: payload
+  };
 } // 切换是否连续测量
 function openIO() {
   return {
@@ -6167,12 +6187,48 @@ var formatToString = function formatToString(value) {
   }
 };
 
-var DicomInfo = function DicomInfo(datasets, pixelData) {
+var DicomInfo = function DicomInfo(datasets, pixelData, isAnonymous) {
   classCallCheck(this, DicomInfo);
 
   return new Proxy(this, {
     get: function get(dicomTarget, dicomProp, dicomReceiver) {
       switch (true) {
+        case dicomProp === 'PatientName':
+          {
+            if (isAnonymous) {
+              return '***';
+            } else {
+              return new DicomElementAggregator(datasets, dicomProp);
+            }
+          }
+
+        case dicomProp === 'PatientSex':
+          {
+            if (isAnonymous) {
+              return '*';
+            } else {
+              return new DicomElementAggregator(datasets, dicomProp);
+            }
+          }
+
+        case dicomProp === 'PatientAge':
+          {
+            if (isAnonymous) {
+              return '**';
+            } else {
+              return new DicomElementAggregator(datasets, dicomProp);
+            }
+          }
+
+        case dicomProp === 'PatientID' || dicomProp === 'InstitutionName':
+          {
+            if (isAnonymous) {
+              return '****';
+            } else {
+              return new DicomElementAggregator(datasets, dicomProp);
+            }
+          }
+
         case dicomProp === 'datasets':
           {
             return datasets;
@@ -10309,6 +10365,7 @@ function resetTaskPool() {
 }
 
 var dicomCache = {};
+var isAnonymous = false;
 
 var loadAndCacheDicom = function loadAndCacheDicom(imageId) {
   return new Promise(function (resolve, reject) {
@@ -10319,7 +10376,7 @@ var loadAndCacheDicom = function loadAndCacheDicom(imageId) {
 
     var imagePromise = loadAndCacheImagePlus(imageId);
     imagePromise.then(function (image) {
-      var dicom = new DicomInfo(image.data, image.getPixelData());
+      var dicom = new DicomInfo(image.data, image.getPixelData(), isAnonymous);
       dicomCache[imageId] = dicom;
       resolve(dicom);
     }, function (e) {
@@ -10332,6 +10389,18 @@ var purgeDicomCache = function purgeDicomCache() {
   dicomCache = {};
 };
 
+var setInfoAnonymous = function setInfoAnonymous() {
+  isAnonymous = true;
+};
+
+var setNotAnonymous = function setNotAnonymous() {
+  isAnonymous = false;
+};
+
+var getAnonymousState = function getAnonymousState() {
+  return isAnonymous;
+};
+
 function _createSuper$c(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$c(); return function _createSuperInternal() { var Super = getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return possibleConstructorReturn(this, result); }; }
 
 function _isNativeReflectConstruct$c() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
@@ -32570,6 +32639,7 @@ var ButtonGroup = /*#__PURE__*/function (_Component) {
 
 defineProperty(ButtonGroup, "propTypes", {});
 
+var anonymousKeys = ['InstitutionName', 'InstitutionAddress', 'PatientID', 'IssuerOfPatientID', 'TypeOfPatientID', 'IssuerOfPatientIDQualifiersSequence', 'PatientName', 'PatientSex', 'PatientAge', 'PatientBirthDate', 'PatientBirthTime', 'PatientBirthName', 'PatientSize', 'PatientWeight', 'PatientAddress', 'PatientMotherBirthName', 'PatientTelephoneNumbers', 'PatientComments'];
 /**
  *
  * Get tag js object from our custom dicom object
@@ -32599,6 +32669,7 @@ var formatDicom = function formatDicom(dicom) {
     ]
   };
   var formatedDicomInfos = [];
+  var isAnonymous = getAnonymousState();
   lodash$1.forEach(dicom, function (item) {
     var tagID = item.tag.toUpperCase();
     var value;
@@ -32608,7 +32679,13 @@ var formatDicom = function formatDicom(dicom) {
     if (options.maxLength && item.element.length > options.maxLength) {
       value = "Length(".concat(item.element.length, ")");
     } else {
-      value = item.toString();
+      value = item.toString(); // 匿名
+
+      if (isAnonymous) {
+        if (item.keyword && lodash$1.includes(anonymousKeys, item.keyword)) {
+          value = "**";
+        }
+      }
     }
 
     if (item.vr === 'SQ') {
@@ -32741,72 +32818,100 @@ var DicomInfoModal = /*#__PURE__*/function (_Component) {
 
     _this = _super.call(this, props);
 
-    defineProperty(assertThisInitialized(_this), "getAndFormatOriginData", function (imageId) {
-      var imagePromise = loadAndCacheImagePlus(imageId);
-      imagePromise.then(function (image) {
-        var dicom = new DicomInfo(image.data);
-        var dicomInfo = getTagInfo(dicom); // id第一位是奇数 处理成收纳的形式
-
-        var originDataWithIdOdd = []; // id第一位是偶数
-        // let originDataWithIdEven = [];
-
-        var dataSource = [];
-        lodash$1.forEach(dicomInfo, function (item) {
-          var id;
-          var idStart;
-          xregexp.replace(item.tagID, xregexp('\\((?<a>.{4}),(?<b>.{4})\\)'), function (match) {
-            id = match && lodash$1.toString(match.a) + lodash$1.toString(match.b) || null;
-            idStart = match && match.a || null;
-          });
-          var tagNameOrigin = dicomDataDictionary$1.standardDataElements[id] ? dicomDataDictionary$1.standardDataElements[id].name : null;
+    defineProperty(assertThisInitialized(_this), "getAndFormatOriginData", /*#__PURE__*/function () {
+      var _ref = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(imageId) {
+        var dicom, dicomInfo, originDataWithIdOdd, dataSource, dataSourceScan;
+        return regenerator.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return loadAndCacheDicom(imageId);
 
-          var data = _objectSpread$l(_objectSpread$l({}, item), {}, {
-            tagIDOrigin: id,
-            idStart: idStart,
-            tagNameOrigin: tagNameOrigin
-          });
+              case 2:
+                dicom = _context.sent;
 
-          if (idStart && idStart.substring(idStart.length - 1) % 2 === 1) {
-            originDataWithIdOdd.push(data);
-          } else {
-            dataSource.push(data);
-          }
-        });
+                if (dicom) {
+                  _context.next = 5;
+                  break;
+                }
 
-        if (originDataWithIdOdd && originDataWithIdOdd.length > 0) {
-          originDataWithIdOdd = lodash$1.groupBy(originDataWithIdOdd, 'idStart');
-          lodash$1.forEach(originDataWithIdOdd, function (item) {
-            if (item.length === 1) {
-              dataSource = lodash$1.concat(dataSource, item);
-            } else {
-              // 收纳
-              var firstItem = item[0];
+                return _context.abrupt("return");
 
-              var _item = item.splice(1);
+              case 5:
+                dicomInfo = getTagInfo(dicom); // id第一位是奇数 处理成收纳的形式
+
+                originDataWithIdOdd = []; // id第一位是偶数
+                // let originDataWithIdEven = [];
+
+                dataSource = [];
+                lodash$1.forEach(dicomInfo, function (item) {
+                  var id;
+                  var idStart;
+                  xregexp.replace(item.tagID, xregexp('\\((?<a>.{4}),(?<b>.{4})\\)'), function (match) {
+                    id = match && lodash$1.toString(match.a) + lodash$1.toString(match.b) || null;
+                    idStart = match && match.a || null;
+                  });
+                  var tagNameOrigin = dicomDataDictionary$1.standardDataElements[id] ? dicomDataDictionary$1.standardDataElements[id].name : null;
 
-              dataSource.push(_objectSpread$l(_objectSpread$l({}, firstItem), {}, {
-                items: [_item]
-              }));
-            }
-          });
-        }
+                  var data = _objectSpread$l(_objectSpread$l({}, item), {}, {
+                    tagIDOrigin: id,
+                    idStart: idStart,
+                    tagNameOrigin: tagNameOrigin
+                  });
 
-        dataSource = lodash$1.sortBy(dataSource, 'tagIDOrigin');
-        var dataSourceScan = lodash$1.map(dicomTagsKeysScan, function (key) {
-          return lodash$1.find(dataSource, {
-            'tagIDOrigin': key
-          }) || {
-            tagIDOrigin: key,
-            tagNameOrigin: dicomDataDictionary$1.standardDataElements[key] && dicomDataDictionary$1.standardDataElements[key].name || ''
-          };
-        });
+                  if (idStart && idStart.substring(idStart.length - 1) % 2 === 1) {
+                    originDataWithIdOdd.push(data);
+                  } else {
+                    dataSource.push(data);
+                  }
+                });
 
-        _this.setState({
-          dataSource: dataSource,
-          dataSourceScan: dataSourceScan
-        });
-      });
-    });
+                if (originDataWithIdOdd && originDataWithIdOdd.length > 0) {
+                  originDataWithIdOdd = lodash$1.groupBy(originDataWithIdOdd, 'idStart');
+                  lodash$1.forEach(originDataWithIdOdd, function (item) {
+                    if (item.length === 1) {
+                      dataSource = lodash$1.concat(dataSource, item);
+                    } else {
+                      // 收纳
+                      var firstItem = item[0];
+
+                      var _item = item.splice(1);
+
+                      dataSource.push(_objectSpread$l(_objectSpread$l({}, firstItem), {}, {
+                        items: [_item]
+                      }));
+                    }
+                  });
+                }
+
+                dataSource = lodash$1.sortBy(dataSource, 'tagIDOrigin');
+                dataSourceScan = lodash$1.map(dicomTagsKeysScan, function (key) {
+                  return lodash$1.find(dataSource, {
+                    'tagIDOrigin': key
+                  }) || {
+                    tagIDOrigin: key,
+                    tagNameOrigin: dicomDataDictionary$1.standardDataElements[key] && dicomDataDictionary$1.standardDataElements[key].name || ''
+                  };
+                });
+
+                _this.setState({
+                  dataSource: dataSource,
+                  dataSourceScan: dataSourceScan
+                });
+
+              case 13:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
 
     defineProperty(assertThisInitialized(_this), "setDicomModalTag", function (dicomModalTag) {
       _this.setState({
@@ -55043,7 +55148,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
     },
     initSeries: function () {
       var _initSeries2 = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(changeStudy, callback) {
-        var data, synchronizer, linkSynchronizer, linkImageModeSynchronizer, linkScrollSynchronizer, options, _study, series, needCheckMultiFrame, hasMultiFrame, modalitiesInStudy, i, item, wado, url, dataSet, numFrames, imageIds, _i, imageId, seriesCurrentIndex, firstReady, maxRequest, retry, clearCacheEveryLoad, dicom, frameTime, toolLocalDefaultState, realActiveIndex;
+        var data, synchronizer, linkSynchronizer, linkImageModeSynchronizer, linkScrollSynchronizer, options, _study, series, needCheckMultiFrame, hasMultiFrame, modalitiesInStudy, i, item, wado, url, dataSet, numFrames, imageIds, _i, imageId, seriesCurrentIndex, firstReady, maxRequest, retry, clearCacheEveryLoad, dicom, frameTime, linkToolLocalDefaultState, realActiveIndex, continuousMeasureLocalDefaultState;
 
         return regenerator.wrap(function _callee$(_context) {
           while (1) {
@@ -55051,6 +55156,7 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
               case 0:
                 /**
                  * 初始化study
+                 * - 是否是匿名显示
                  * - 初始化 cornerstoneWADOImageLoader token
                  * - 初始化 global toolState (study中存在serverToolState的情况)
                  * - 初始化 手术路径规划的缓存数据 (study中是否存在centesisPath)
@@ -55061,11 +55167,18 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                  * - 初始化viewport缓存池
                  * - 初始化图像预加载
                  * - 如果有frameTime的话设置fps
-                 * - 初始化本地存储的工具初始状态（目前包含：自动联动）
+                 * - 初始化本地存储的工具初始状态（目前包含：自动联动、连续测量）
                  *
                  * 检查io是否为true是的话打开同屏开关
                  */
                 console.log('[paladin] - init series');
+
+                if (ownProps.anonymous && ownProps.anonymous === true) {
+                  setInfoAnonymous();
+                } else {
+                  setNotAnonymous();
+                }
+
                 cornerstoneWADOImageLoader.configure({
                   beforeSend: function beforeSend(xhr) {
                     xhr.setRequestHeader('Authorization', "bearer ".concat(ownProps.token));
@@ -55141,32 +55254,32 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                 });
 
                 if (!needCheckMultiFrame) {
-                  _context.next = 44;
+                  _context.next = 45;
                   break;
                 }
 
                 i = 0;
 
-              case 28:
+              case 29:
                 if (!(i < series.length)) {
-                  _context.next = 44;
+                  _context.next = 45;
                   break;
                 }
 
                 item = series[i];
 
                 if (!(item.numberOfSeriesRelatedInstances && item.numberOfSeriesRelatedInstances === 1)) {
-                  _context.next = 41;
+                  _context.next = 42;
                   break;
                 }
 
                 wado = lodash$1.cloneDeep(item.imageIds[0].split(':'));
                 wado.shift();
                 url = wado.join(':');
-                _context.next = 36;
+                _context.next = 37;
                 return cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.load(url, cornerstoneWADOImageLoader.internal.xhrRequest);
 
-              case 36:
+              case 37:
                 dataSet = _context.sent;
                 // 这边如果加载了的话 进度条也需要匹配上
                 propsFromDispatch.setSeriesLoaded(item.seriesInstanceUID);
@@ -55190,12 +55303,12 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
 
                 cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.purge();
 
-              case 41:
+              case 42:
                 i++;
-                _context.next = 28;
+                _context.next = 29;
                 break;
 
-              case 44:
+              case 45:
                 // 初始化seriesCurrentIndex
                 seriesCurrentIndex = Array.apply(null, Array(series.length)).map(function () {
                   return 0;
@@ -55251,21 +55364,21 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   })]
                 }); // 如果有frameTime的话设置fps
 
-                _context.next = 59;
+                _context.next = 60;
                 return loadAndCacheDicom(series[0].imageIds[0]);
 
-              case 59:
+              case 60:
                 dicom = _context.sent;
 
                 if (dicom && dicom.FrameTime && dicom.FrameTime.value) {
                   frameTime = dicom.FrameTime.value;
                   propsFromDispatch.setCineFps(lodash$1.round(1000 / frameTime, 3) || 3);
-                } // 初始化本地存储的工具初始状态（目前包含：自动联动）
+                } // 初始化本地存储的工具初始状态（目前包含：自动联动、连续测量）
 
 
-                toolLocalDefaultState = window.localStorage.getItem('hellfire-link-tool-default-state');
+                linkToolLocalDefaultState = window.localStorage.getItem('hellfire-link-tool-default-state');
 
-                if (toolLocalDefaultState && toolLocalDefaultState === 'open') {
+                if (linkToolLocalDefaultState && linkToolLocalDefaultState === 'open') {
                   propsFromDispatch.activeDicomFunction("Link");
                   realActiveIndex = getCurrentRealActiveIndex();
                   openAutoLink({
@@ -55282,7 +55395,13 @@ var mergeProps$t = function mergeProps(propsFromState, propsFromDispatch, ownPro
                   });
                 }
 
-              case 63:
+                continuousMeasureLocalDefaultState = window.localStorage.getItem('hellfire-continuous-measure-default-state');
+
+                if (continuousMeasureLocalDefaultState && continuousMeasureLocalDefaultState === 'close') {
+                  propsFromDispatch.setMeasure(false);
+                }
+
+              case 66:
               case "end":
                 return _context.stop();
             }
@@ -55384,7 +55503,8 @@ var ConnectedDicomView = reactRedux.connect(mapStateToProps$u, {
   setOriginStudyData: setOriginStudyData,
   setSeriesCurrentIndex: setSeriesCurrentIndex,
   setSeries: setSeries,
-  setLinkSeries: setLinkSeries
+  setLinkSeries: setLinkSeries,
+  setMeasure: setMeasure
 }, mergeProps$t, withRef())(DicomView);
 
 function withRef() {