血压加号bug修改2646

src/containers/MultSpread.js

@@ -22,6 +22,10 @@ const getCopyData = (copyId,inx,boxMark)=>{
   return (dispatch,getStore)=>{
     const state = getStore();
     const copy = state.homePage.addItems[copyId];
+    if(!copy){
+      console.log("记录数据有误，未找到匹配");
+      return;
+    }
     dispatch({
       type:typeObj[+boxMark],
       data:JSON.stringify(copy),

src/modules/HomePage/index.jsx

@@ -6,7 +6,7 @@ import BodyContainer from "@components/BodyContainer";
 import {ConfirmModal} from '@commonComp';
 import store from '@store';
 
-import {HIDEDROP,SETMINSCREEN,SETSYSTEMCONFIG,SETPRE} from '@store/types/homePage.js';
+import {HIDEDROP,SETMINSCREEN,SETSYSTEMCONFIG,SETPRE,SETREADDITEMS} from '@store/types/homePage.js';
 import {billing} from '@store/async-actions/pushMessage';
 import {CLEAR_SEARCH} from '@types/mainSuit';
 import {CURRENT_CLEAR} from '@types/currentIll';
@@ -27,7 +27,10 @@ class HomePage extends Component {
         this.hidePops = this.hidePops.bind(this);
     }
     componentDidMount(){
-        const {setWindow,getChronicList,getConfig} = this.props;
+        const {setWindow,getChronicList,getConfig,clearAddItems} = this.props;
+        //清除已保存的血压标签数据
+        clearAddItems();
+        //获取配置
         getConfig();
         getChronicList&&getChronicList();//获取慢病列表
         // 获取并监听窗口宽度，用于有横向滚动条时患者信息和打印预览跟随滚动
@@ -93,6 +96,11 @@ const mapStateToProps = function (state) {
 };
 const mapDispatchToProps = function (dispatch) {
   return {
+    clearAddItems(){
+      dispatch({
+        type:SETREADDITEMS
+      })
+    },
     referRecord(){
         pushAllDataList(1,'push',store.getState().homePage.preData,'preIcss');
         dispatch(billing())

src/store/actions/homePage.js

@@ -1,6 +1,10 @@
 //带加号初始数据保存
 export const setAddItemInit = (state,action)=>{
   let res = Object.assign({},state);
+  if(!action.data&&!action.id){
+    res.addItems = {};
+    return res;
+  }
   if(res.addItems[action.id]){
     return res;
   }

src/utils/tools.js

@@ -94,7 +94,7 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
     jsonData.pacs = baseList.assistCheck.assistLabel;     //辅检
     jsonData.diag = baseList.diagnosticList.diagnosticList;      //诊断
     jsonData.advice = baseList.pushMessage.advice;       //医嘱
-    //jsonData.addItems = baseList.homePage.addItems||{};
+    jsonData.addItems = baseList.homePage.addItems||{};
     jsonData.mainsuitIds = baseList.mainSuit.mainIds;      //主诉去重
     jsonData.mainChronicDesease = baseList.mainSuit.chronicDesease;      //主诉慢病{}
     jsonData.diagChronicMagItem = baseList.diagnosticList.chronicMagItem;      //诊断慢病{}
@@ -292,10 +292,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     data:dataJson.advice,
                     saveText:dataJsonStr.advice
                 });
-                /*store.dispatch({
+                store.dispatch({
                   type:SETREADDITEMS,
                   data:dataJson.addItems
-                });*/
+                });
                 store.dispatch({
                   type:CLEAR_FIRST_MAIN_DIAG,
                   flag:dataJson.isFirstMainDiag
@@ -358,10 +358,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     data:dataJson.advice,
                     saveText:dataJsonStr[7].content ? dataJsonStr[7].content:''
                 });
-              /*store.dispatch({
+              store.dispatch({
                 type:SETREADDITEMS,
                 data:dataJson.addItems
-              });*/
+              });
               store.dispatch({
                 type:CLEAR_FIRST_MAIN_DIAG,
                 flag:dataJson.isFirstMainDiag
@@ -412,10 +412,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     data:dataJson.advice,
                     saveText:dataJsonStr.advice,
                 });
-              /*store.dispatch({
+              store.dispatch({
                 type:SETREADDITEMS,
                 data:dataJson.addItems
-              });*/
+              });
               store.dispatch({
                 type:CLEAR_FIRST_MAIN_DIAG,
                 flag:dataJson.isFirstMainDiag
@@ -473,10 +473,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     data:dataJson.advice,
                     saveText:dataJsonStr[7].content ? dataJsonStr[7].content:''
                 });
-              /*store.dispatch({
+              store.dispatch({
                 type:SETREADDITEMS,
                 data:dataJson.addItems
-              });*/
+              });
               store.dispatch({
                 type:CLEAR_FIRST_MAIN_DIAG,
                 flag:dataJson.isFirstMainDiag