其他史查体回读bug修改

src/components/OtherHistory/index.jsx

@@ -36,10 +36,10 @@ class OtherHistory extends Component{
   getData(){
     //第一次聚焦其他史时，主诉有数据则获取最近一次其他史记录（没有的话显示初始模板），主诉无数据则显示提示；其他时间其他史模板数据不调接口
     const {hasMain,type,setInitData,isEmpty} = this.props;
-
+    console.log(isEmpty)
     //无主诉提示在EditableSpan里
     //智能模式有主诉或者文本模式获取最近历史
-    if((+type===0&&hasMain&&isEmpty!=false)||+type===1){
+    if((+type===0&&hasMain&&isEmpty!=false)||(+type===1&&isEmpty!=false)){
       setInitData();
     }
 

src/containers/eleType.js

@@ -124,7 +124,7 @@ function multCheckLabels(params,tagType){
 }
 
 export default function(params){
-  const data = params.item;console.log(params)
+  const data = params.item;
   switch (+data.tagType) {
     case 1:
     case 5:

src/utils/tools.js

@@ -165,7 +165,9 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
     jsonData.chief = baseList.mainSuit.data;      //主诉
     jsonData.present = baseList.currentIll.data;    //现病史
     jsonData.other = baseList.otherHistory.data;      //其他史
+    jsonData.otherHistoryIsEmpty = baseList.otherHistory.isEmpty;
     jsonData.vital = baseList.checkBody.data;    //查体
+    jsonData.checkBodyIsEmpty = baseList.checkBody.isEmpty;
     jsonData.lis.labelList = baseList.inspect.labelList;      //化验
     jsonData.lis.getExcelDataList =  baseList.inspect.getExcelDataList;      //化验导入
     jsonData.pacs = baseList.assistCheck.assistLabel;     //辅检
@@ -178,7 +180,7 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
     jsonData.addItems = baseList.homePage.addItems||{};
     jsonData.mainsuitIds = baseList.mainSuit.mainIds;      //主诉去重
     jsonData.currentIds = baseList.currentIll.symptomIds;      //现病史去重
-    // console.log(jsonData,'结构化数据获取')
+    //console.log(jsonData,'结构化数据获取')
     return jsonData;
 }
 const getAllDataStringList =(baseList) =>{           //获取所有模块文本的数据
@@ -276,6 +278,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     type: CLEAROTHERHISTORY,
                     data:dataJson.other,
                     selecteds:dataJson.otherHistorySelecteds?dataJson.otherHistorySelecteds:[],
+                    isEmpty:dataJson.otherHistoryIsEmpty,
                     saveText:JSON.parse(dataJsonStr.other),
                     editClear:dataJson.other.length>0?false:true
                 });
@@ -283,6 +286,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     type: CLEARCHECKBODY,
                     data:dataJson.vital,
                     selecteds:dataJson.checkBodySelecteds?dataJson.checkBodySelecteds:[],
+                    isEmpty:dataJson.checkBodyIsEmpty,
                     saveText:JSON.parse(dataJsonStr.vital)
                 });
                 store.dispatch(clearAllLabel(
@@ -330,12 +334,14 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     data:dataJson.other,
                     selecteds:dataJson.otherHistorySelecteds?dataJson.otherHistorySelecteds:[],
                     saveText:dataJsonStr[2].content ? JSON.parse(dataJsonStr[2].content):[],
+                    isEmpty:dataJson.otherHistoryIsEmpty,
                     editClear:dataJson.other.length>0?false:true
                 });
                 store.dispatch({
                     type: CLEARCHECKBODY,
                     data:dataJson.vital,
                     selecteds:dataJson.checkBodySelecteds?dataJson.checkBodySelecteds:[],
+                    isEmpty:dataJson.checkBodyIsEmpty,
                     saveText:dataJsonStr[3].content ? JSON.parse(dataJsonStr[3].content):[]
                 });
                 store.dispatch(clearAllLabel(
@@ -381,11 +387,13 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                 store.dispatch({
                     type: CLEAROTHERHISTORY,
                     data:[],
+                    isEmpty:dataJson.otherHistoryIsEmpty,
                     saveText:JSON.parse(dataJsonStr.other)
                 });
                 store.dispatch({
                     type: CLEARCHECKBODY,
                     data:dataJson.vital,
+                    isEmpty:dataJson.checkBodyIsEmpty,
                     saveText:JSON.parse(dataJsonStr.vital)
                 });
                 store.dispatch(clearAllLabel(
@@ -429,11 +437,13 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                 store.dispatch({
                     type: CLEAROTHERHISTORY,
                     data:[],
+                    isEmpty:dataJson.otherHistoryIsEmpty,
                     saveText:dataJsonStr[2].content ? JSON.parse(dataJsonStr[2].content) :[]
                 });
                 store.dispatch({
                     type: CLEARCHECKBODY,
                     data:dataJson.vital,
+                    isEmpty:dataJson.checkBodyIsEmpty,
                     saveText:dataJsonStr[3].content ? JSON.parse(dataJsonStr[3].content):[]
                 });
                 store.dispatch(clearAllLabel(