Merge remote-tracking branch 'origin/Chronic_lcf' into ChronicMag

# Conflicts:
#	src/common/components/ComplexModal/index.less
#	src/store/actions/currentIll.js

src/components/DiagnosticList/index.jsx

@@ -3,7 +3,7 @@ import style from './index.less';
 import del_icon from './img/delete.png'
 import diagUp from './img/diagUp.png'
 import diagDown from './img/diagDown.png'
-import {ConfirmModal, Message} from '@commonComp';
+import {ConfirmModal, Message,ComplexModal} from '@commonComp';
 import Notify from '@commonComp/Notify';
 import Treat from '@containers/Treat'
 import store from '@store';
@@ -11,6 +11,7 @@ import { initItemList } from '@store/async-actions/historyTemplates';
 import { pushAllDataList } 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';
 
 class DiagnosticList extends Component {
     constructor(props) {
@@ -87,10 +88,10 @@ class DiagnosticList extends Component {
         getTips && getTips(item);
     }
     referRecord() {
-        const { hideReferRecord, showHistoryCaseModal } = this.props
+        const { hideReferRecord, showHistoryCaseModal ,chronicMagItem} = this.props
         hideReferRecord && hideReferRecord()
         showHistoryCaseModal && showHistoryCaseModal()
-        store.dispatch(initItemList());
+        store.dispatch(initItemList(chronicMagItem));
 
     }
     noReferRecord() {
@@ -109,7 +110,6 @@ class DiagnosticList extends Component {
   
         // store.dispatch({type: CONFIRM_TYPE, confirmType: baseObj.sign});
         pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
-        // store.dispatch(billing())
         this.props.getBilling();
         this.setState({
             activeHistory: -1
@@ -147,6 +147,9 @@ class DiagnosticList extends Component {
         const { list, treatment, showReferRecord, showHistoryCase } = this.props
         const { visible, treatTitle } = this.state
         const lastIndex = list.length -1;
+        const footer = <div className={style['footer']}>
+                          <span className={style['okBtn']} onClick={this.referCase}>确定</span>
+                        </div>;
         return(
                 <div className={style['diaglist-wrap']}>
                     {list && (list.length > 0) && list.map((item, index) => {
@@ -179,13 +182,19 @@ class DiagnosticList extends Component {
                     <ConfirmModal visible={showReferRecord} okText='是' cancelText='否' confirm={this.referRecord}  cancel={this.noReferRecord} close={this.noReferRecord}>
                         <div className={style['confirm-info']}>是否引用往期病历</div> 
                     </ConfirmModal>
-                    <ConfirmModal visible={showHistoryCase} noFooter='true' title='请选择历史病历' close={this.closeHistoryCaseModal}>
+                    {/*<ConfirmModal visible={showHistoryCase} noFooter='true' title='请选择历史病历' close={this.closeHistoryCaseModal}>
                         {this.getHistoryCase()}
                         <div className={style['confirm-history']}><span className={style['confirm-history-btn']} onClick={this.referCase}>确定</span></div>
-                    </ConfirmModal>
+                    </ConfirmModal>*/}
+                    {showHistoryCase?<ComplexModal onclose={this.closeHistoryCaseModal} footer={footer}
+                      title='请选择历史病历' 
+                      icon={tableIcon} 
+                      height={300}
+                      width={400}>
+                      {this.getHistoryCase()}
+                    </ComplexModal>:''}
                 </div>
                
-            
         )
     }
 }

src/components/DiagnosticList/index.less

@@ -121,5 +121,32 @@
     right: 15px;
 }
 .history-info {
-
+    height: 185px;
+    overflow-y: auto;
+    padding: 15px;
+    >div{
+        line-height: 26px;
+        img{
+            vertical-align: middle;
+            margin-right: 5px;
+        }
+    }
+}
+.footer{
+  .okBtn{
+    width: 80px;
+    height: 34px;
+    line-height: 32px;
+    text-align: center;
+    outline: none;
+    border-radius: 4px;
+    cursor: pointer;
+    border: 1px solid #3B9ED0;
+    box-sizing: border-box;
+    margin-left: 20px;
+    background: #3B9ED0;
+    color: #fff;
+    float: right;
+    margin-right: 20px;
+  }
 }

src/components/PushItems/index.less

@@ -539,4 +539,4 @@
     float: right;
     margin-right: 20px;
   }
-}
+}

src/config/index.js

@@ -8,7 +8,7 @@ export default {
       'NOSPECIAL':'normal',        //无殊标记
       'EXIST':'exist'          //阴性标记
     },
-    moduleCP:{
+    /*moduleCP:{
       '1':'mainSuit',         //主诉
       '2':'current',          //现病史
       '3':'process',          //病程变化
@@ -16,6 +16,14 @@ export default {
       // '5':'checkbody'        //查体
       '5':'currentEmpty',        //现病史空模板
       '6':'addSymptom'        //添加病情变化--主诉
+    },*/
+    moduleCP:{//使用type
+      '1':'mainSuit',         //主诉
+      '2':'current',          //现病史
+      '3':'currentEmpty',        //现病史空模板
+      '4':'otherHisModel',         //其他史
+      '21':'addSymptom',      //主诉子模板--添加病情变化
+      '22':'process',          //现病史子模板--病程变化
     },
     textId:'text',        //自由文本标签的id,
     textLabel:'{"tagType":"8","id":"","name":""}',

src/containers/DiagnosticList.js

@@ -20,6 +20,7 @@ function mapStateToProps(state) {
         showReferRecord: state.diagnosticList.showReferRecord,
         showHistoryCase: state.diagnosticList.showHistoryCase,
         items:state.historyTemplates.items,
+        chronicMagItem: state.diagnosticList.chronicMagItem,
     }
 }
 

src/store/async-actions/diagnosticList.js

@@ -1,6 +1,6 @@
 import { SET_DIAG_TO_MAINSUIT, SET_CHRONIC_MAG_ITEM, SHOW_REFER_RECORD } from '@store/types/diagnosticList';
 import {getAllDataList,getAllDataStringList,isAllClear,filterDataArr} from '@utils/tools';
-import {getChronic} from '@store/async-actions/homePage.js';
+import {getChronic,getInitModules} from '@store/async-actions/homePage.js';
 import {storageLocal} from '@utils/tools'
 import { SAVE_FREE } from '@store/types/mainSuit';
 import {ISREAD} from "../types/homePage";
@@ -51,6 +51,8 @@ export const isChronicMag = (item) => {
                                 type: SET_CHRONIC_MAG_ITEM,
                                 chronicMagItem: item
                             })
+                            // 获取慢病模板
+                            dispatch(getInitModules);
                             dispatch({
                                 type: SHOW_REFER_RECORD
                             })
@@ -58,7 +60,6 @@ export const isChronicMag = (item) => {
                     }
                  });
              } else {
-                console.log(999,chronicList)
                 for(let i=0; i<chronicList.length; i++){
                     if(chronicList[i].id==item.id&&chronicList[i].name==item.name){
                         //弹窗提示 “是否引用往期病例”？--往期病例接口、弹窗、引用
@@ -67,6 +68,8 @@ export const isChronicMag = (item) => {
                             type: SET_CHRONIC_MAG_ITEM,
                             chronicMagItem: item
                         })
+                        // 获取慢病模板
+                        dispatch(getInitModules);
                         dispatch({
                             type: SHOW_REFER_RECORD
                         })

src/store/async-actions/historyTemplates.js

@@ -3,16 +3,13 @@ import axios from '@utils/ajax';
 import { initHistory } from '@store/actions/historyTemplates';
 import store from '@store';
 
-export const initItemList = () => {
+export const initItemList = (item) => {
     let baseList = store.getState();
     // let whichSign = baseList.typeConfig.typeConfig;
     let state = baseList.patInfo.message;
+    const param = item?{"hospitalId": state.hospitalId,"patientId": state.patientId,"disName":item.name,"disType":1}:{"hospitalId": state.hospitalId,"patientId": state.patientId};
     return (dispatch) => {
-        axios.json('/inquiryInfo/hisInquirys',{
-            "hospitalId": state.hospitalId, 
-            "patientId": state.patientId, 
-            // "sign":whichSign
-        }).then((res)=>{
+        axios.json('/inquiryInfo/hisInquirys',param).then((res)=>{
             const data =res.data;
             if(data.code == 0){
                 dispatch(initHistory(data.data));

src/store/async-actions/homePage.js

@@ -20,10 +20,10 @@ const api = {
 function modulesParseJson(data){
   let json = {},obj={},saveTextJson={},moduleName={};
   data.map((it)=>{
-    moduleName[config.moduleCP[it.id]] = it.name;//添加病情变化/病程变化子模板需要使用模板名称
+    moduleName[config.moduleCP[it.type]] = it.name;//添加病情变化/病程变化子模板需要使用模板名称
     obj = fullfillText(it.moduleDetailDTOList);
-    json[config.moduleCP[it.id]] = formatContinueDots(obj.newArr);
-    saveTextJson[config.moduleCP[it.id]] = obj.saveText;
+    json[config.moduleCP[it.type]] = formatContinueDots(obj.newArr);
+    saveTextJson[config.moduleCP[it.type]] = obj.saveText;
   });
   return {json,saveTextJson,moduleName};
 }
@@ -31,7 +31,8 @@ function modulesParseJson(data){
 export const getInitModules= (dispatch,getStore)=>{
   const state = getStore();
   const {message} = state.patInfo;
-  const chronicId = '';//诊断为慢病复诊时储存慢病信息到store
+  const chronicMagItem = state.diagnosticList.chronicMagItem;
+  const chronicId = chronicMagItem?chronicMagItem.id:'';//诊断为慢病复诊时储存慢病信息到store
   const param = {
     age:message.patientAge,
     sexType:message.sex,
@@ -42,15 +43,15 @@ export const getInitModules= (dispatch,getStore)=>{
   return json(api.getModules,param).then((res) => {
       dispatch(initHistoryDetails(message));      //历史病历回读
       if (res.data.code == '0') {
-        const newObj = modulesParseJson(res.data.data);
+        const newObj = modulesParseJson(res.data.data);console.log("模板分发：",newObj);
         const initData = newObj.json;
         const initSaveText = newObj.saveTextJson;
         const initModuleName = newObj.moduleName;
         // 将所有模板缓存，方便根据id取子模板
-        // localStorage.setItem('modules',JSON.stringify(res.data.data));
         dispatch({
           type: SETALLMODULES,
-          data: res.data.data
+          data: res.data.data,
+          // ifChronic:chronicMagItem&&chronicMagItem.id?true:false
         });
         dispatch({
           type: SETINITDATA,