Merge branch 'Chronic-ll' into ChronicMag

src/components/AssessResult/index.jsx

@@ -58,7 +58,7 @@ class AssessResult extends Component {
   }
   handoutTypes(item,i){
     const {getIndexData,indexData,timeTypes,wholeAssessData,scaleInfo,getScaleInfo,possible,radioVal} =this.props;
-    const {chooseSelecteds,wholeAssessItems,wholeAssessText,chartTimeTypes} = this.state;console.log(possible)
+    const {chooseSelecteds,wholeAssessItems,wholeAssessText,chartTimeTypes} = this.state;
     const chartData = indexData;
     const name = item.regionName+"：";
     const list = item.data&&item.data.rows;

src/components/DiagnosticList/index.jsx

@@ -8,7 +8,7 @@ import Notify from '@commonComp/Notify';
 import Treat from '@containers/Treat'
 import store from '@store';
 import { initItemList } from '@store/async-actions/historyTemplates';
-import { pushAllDataList } from '@utils/tools';
+import { pushAllDataList,inspectAndAssist } from '@utils/tools';
 import iconRadioDefault from '@common/images/icon-radio-default.png'
 import iconRadioActive from '@common/images/icon-radio-active.png'
 import tableIcon from '@common/images/table.png';
@@ -101,6 +101,7 @@ class DiagnosticList extends Component {
     noReferRecord() {
         const { hideReferRecord } = this.props
         hideReferRecord && hideReferRecord()
+        inspectAndAssist()//化验辅检模板
     }
     referCase() {
         const { hideHistoryCaseModal, items } = this.props

src/components/MainSuit/index.jsx

@@ -11,7 +11,7 @@ import { initItemList } from '@store/async-actions/historyTemplates';
 import tableIcon from '@common/images/table.png';
 import iconRadioDefault from '@common/images/icon-radio-default.png'
 import iconRadioActive from '@common/images/icon-radio-active.png'
-import { pushAllDataList } from '@utils/tools';
+import { pushAllDataList,inspectAndAssist } from '@utils/tools';
 import $ from 'jquery';
 import store from '@store';
 
@@ -295,6 +295,7 @@ class MainSuit extends Component{
     closeHisBox&&closeHisBox();
     // 不引用病例 -直接分发模板进行填充
     autoFillMoudles && autoFillMoudles()
+    inspectAndAssist()//化验辅检模板
   }
   referCase() {
         const { items ,pureSaveChronic} = this.props

src/store/actions/diagnosticList.js

@@ -74,7 +74,7 @@ export const clearAllDiag = (state, action) => {
     res.diagnosticStr = action.saveText
     res.mainSuitStr = action.mainSuitStr
     res.diagnosticStrNoType = action.saveText
-    res.chronicMagItem = ''
+    res.chronicMagItem = action.chronicMagItem
     return res;
 }
 

src/utils/tools.js

@@ -187,6 +187,8 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
     jsonData.checkBodySelecteds = baseList.checkBody.selecteds;      //主诉选中状态保存
     jsonData.addItems = baseList.homePage.addItems||{};
     jsonData.mainsuitIds = baseList.mainSuit.mainIds;      //主诉去重
+    jsonData.mainChronicDesease = baseList.mainSuit.chronicDesease;      //主诉慢病{}
+    jsonData.diagChronicMagItem = baseList.diagnosticList.chronicMagItem;      //诊断慢病{}
     jsonData.currentIds = baseList.currentIll.symptomIds;      //现病史去重
     jsonData.isFirstMainDiag = baseList.treat.isFirstMainDiag;      //治疗方案
     // console.log(jsonData,'结构化数据获取')
@@ -256,6 +258,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
             data:[],
             saveText:'',
             mainSuitStr: '',
+            chronicMagItem:{}
         });
         store.dispatch({
             type: CLEAR_ALL_PUSH_MESSAGE,
@@ -283,6 +286,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     selecteds:dataJson.mainSuitSelecteds?dataJson.mainSuitSelecteds:[],
                     saveText:JSON.parse(dataJsonStr.chief),
                     mainIds:dataJson.mainsuitIds?dataJson.mainsuitIds:[],
+                    chronicDesease:dataJson.mainChronicDesease,
                 });
                 store.dispatch({
                     type: CLEAR_CURRENT_ILL,
@@ -320,7 +324,8 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                 store.dispatch({
                     type: CLEAR_ALL_DIAG,
                     data:dataJson.diag,
-                    saveText:dataJsonStr.diag
+                    saveText:dataJsonStr.diag,
+                    chronicMagItem:dataJson.diagChronicMagItem
                 });
                 store.dispatch({
                     type: CLEAR_ALL_PUSH_MESSAGE,
@@ -348,6 +353,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     selecteds:dataJson.mainSuitSelecteds?dataJson.mainSuitSelecteds:[],
                     saveText:dataJsonStr[0].content ? JSON.parse(dataJsonStr[0].content) :[],
                     mainIds:dataJson.mainsuitIds?dataJson.mainsuitIds:[],
+                    chronicDesease:dataJson.mainChronicDesease,
                 });
                 store.dispatch({
                     type: CLEAR_CURRENT_ILL,
@@ -388,7 +394,8 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                 store.dispatch({
                     type: CLEAR_ALL_DIAG,
                     data:dataJson.diag,
-                    saveText:dataJsonStr[6].content ? dataJsonStr[6].content:''
+                    saveText:dataJsonStr[6].content ? dataJsonStr[6].content:'',
+                    chronicMagItem:dataJson.diagChronicMagItem
                 });
                 store.dispatch({
                     type: CLEAR_ALL_PUSH_MESSAGE,
@@ -846,20 +853,10 @@ function getCurrentDate(){
   return date;
 }
 function inspectAndAssist(){
-  let obj = {   //添加化验
-    details: [],
-    name: '',
-    questionId: '',
-    showType: 1,
-  }
-  let obj1 = {  //添加辅检
-    name: '',
-    questionId: '',
-    showType: 1,
-    time:getCurrentDate(),
-    value:''
-  }
   const state = store.getState();
+  let mainType = state.typeConfig.typeConfig
+  if(mainType == 1){return}//文本模式不放化验辅检的模板
+
   let tmpAll = state.homePage.allModules;
   let tmpInspected = state.inspect.labelList;
   let tmpAssisted = state.assistCheck.assistLabel;
@@ -874,7 +871,13 @@ function inspectAndAssist(){
     }
   }
   for(let i = 0;i < tmpInspect.length;i++){//化验数据处理
-    let tmpObj = JSON.parse(JSON.stringify(obj));
+    let tmpObj = {   //添加化验
+      details: [],
+      name: '',
+      questionId: '',
+      showType: 1,
+    }
+    // let tmpObj = JSON.parse(JSON.stringify(obj));
     if (tmpInspect[i].controlType == 0) {
       tmpDetail = tmpInspect[i].questionMapping
     }else if(tmpInspect[i].controlType == 1 || tmpInspect[i].controlType == 6){
@@ -886,7 +889,14 @@ function inspectAndAssist(){
     assayArr.push(tmpObj)
   }
   for(let i = 0;i < tmpAssist.length;i++){//辅检数据处理
-    let tmpObj = JSON.parse(JSON.stringify(obj1));
+    let tmpObj = {  //添加辅检
+      name: '',
+      questionId: '',
+      showType: 1,
+      time:getCurrentDate(),
+      value:''
+    }
+    // let tmpObj = JSON.parse(JSON.stringify(obj1));
     tmpObj.questionId = tmpAssist[i].id
     tmpObj.name = tmpAssist[i].name
     checkArr.push(tmpObj)