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

src/components/DiagnosticList/index.jsx

@@ -164,7 +164,7 @@ class DiagnosticList extends Component {
                                     {item.type === 1 ? <span className={style['diag-first']}>初诊</span> :<span className={style['diag-second']}> 复诊</span>}
                                     <span className={style['treat']}
                                         //   style ={{ color: hasTreat ?'' : 'gray', border: hasTreat ?'1px solid #3B9ED0' : '1px solid gray', cursor: hasTreat ? '' : 'text'}}
-                                          style ={hasTreat ? '' : { color: 'gray', border: '1px solid gray', cursor: 'auto'}}
+                                          style ={hasTreat ? '' : { color: 'gray', border: '1px solid gray', cursor: 'text'}}
                                           onClick={() =>{hasTreat && this.showTreat(item, index)}}>
                                           治疗方案
                                     </span>

src/components/PreviewBody/index.jsx

@@ -4,7 +4,7 @@ import { normalVal, filterDataArr, filterOtherDataArr,timestampToTime } from '@u
 import Notify from '@commonComp/Notify';
 import Information from '../Information';
 import $ from "jquery";
-import AssessResultHis from '@containers/AssessResultHis'
+// import AssessResultHis from '@containers/AssessResultHis'
 
 class PreviewBody extends Component {
   constructor(props) {

src/store/actions/pushMessage.js

@@ -48,7 +48,6 @@ function getAdviceStr(advice) {
 			} else {
 				AdviceStr = AdviceStr.substring(1, AdviceStr.length) + ', ' + scheme[i].treatment[j].treatmentStr
 			}
-			
 		}
 	}
 	if(commontreatment)  { 
@@ -71,13 +70,16 @@ export const addScheme = (state, action) => {
   let RepeatIndex;
   
   for (let i = 0; i < treatment.length; i++) {
-    let treatmentStr = '';
+		let treatmentStr = '';
+		let drugList = []
     for (let j = 0; j < treatment[i].medicitionsList.length; j++) {
       if(treatment[i].medicitionsList[j].selected) {
 				treatmentStr = treatmentStr + treatment[i].medicitionsList[j].medicitionName + ', '
+				drugList.push({questionId: treatment[i].medicitionsList[j].id, tagName: treatment[i].medicitionsList[j].medicitionName })
 			}
 	}
 	treatment[i].treatmentStr = treatmentStr.substring(0,treatmentStr.length-2)
+	treatment[i].drugList = drugList
   }
   treatItem.treatment = treatment;
   for (let i = 0; i < scheme.length; i++) {
@@ -85,7 +87,6 @@ export const addScheme = (state, action) => {
       isRepeat = true
     }
 	}
-	
   //判断医嘱中是否包含该诊断
   scheme.map((item, index) => {
     if(item.name === treatItem.name) {
@@ -105,6 +106,8 @@ export const addScheme = (state, action) => {
 						} else {
 							scheme[RepeatIndex].treatment[i].treatmentStr = scheme[RepeatIndex].treatment[i].treatmentStr + '' + treatment[j].medicitionsList[z].medicitionName
 						}
+						scheme[RepeatIndex].treatment[i].drugList.push({questionId: treatment[j].medicitionsList[z].id, tagName: treatment[j].medicitionsList[z].medicitionName })
+
 					}
 				}
 			}
@@ -130,10 +133,24 @@ export const addScheme = (state, action) => {
 		}
      
   }
-  res.AdviceStr = getAdviceStr(res.advice)
+	res.AdviceStr = getAdviceStr(res.advice)
+	res.drugList = getDrugList(res.advice.scheme)
   return res;
 }
 
+//获取开单到医嘱的药品列表
+function getDrugList(scheme) {
+	const drugList = [];
+	for(let i = 0 ;  i < scheme.length; i++) {
+		for(let j = 0; j <scheme[i].treatment.length; j++ ) {
+			for (let z = 0; z < scheme[i].treatment[j].drugList.length; z++) {
+				drugList.push(scheme[i].treatment[j].drugList[z]);
+			}
+		}
+	}
+	return drugList
+}
+
 //设置提示信息
 export const setTips = (state, action) => {
   const res = Object.assign({}, state)
@@ -222,7 +239,8 @@ export const clearAllPushMessage = (state, action) => {
 	res.determine = [];
 	res.assay = [];
 	res.check = [];
-  res.chronicPushItems = [];//量表
+	res.chronicPushItems = [];//量表
+	res.drugList = []; //开单药品列表
 	return res;
 }
 

src/store/async-actions/treat.js

@@ -49,7 +49,8 @@ export const addDiagnostic = (item) => {
                 "vital": emrData.vital
             };
             //判断是否走慢病系统
-            const isChronic = state.diagnosticList.chronicMagItem && state.diagnosticList.chronicMagItem.name||state.mainSuit.chronicDesease && state.mainSuit.chronicDesease.name;
+            // const isChronic = state.diagnosticList.chronicMagItem && state.diagnosticList.chronicMagItem.name||state.mainSuit.chronicDesease && state.mainSuit.chronicDesease.name;
+            const isChronic = true
             if (isChronic) {
                 let chronicList = JSON.parse(storageLocal.get('chronic'));
                 if(!chronicList){
@@ -156,7 +157,8 @@ export const getTreatResult = (item) =>{
         //         "symptom": "恶心，呕吐",
         //         "vital": ""
         // }
-        const isChronic = state.diagnosticList.chronicMagItem && state.diagnosticList.chronicMagItem.name||state.mainSuit.chronicDesease && state.mainSuit.chronicDesease.name;
+        // const isChronic = state.diagnosticList.chronicMagItem && state.diagnosticList.chronicMagItem.name||state.mainSuit.chronicDesease && state.mainSuit.chronicDesease.name;
+        const isChronic = true
         if (isChronic) {
             let chronicList = JSON.parse(storageLocal.get('chronic'));
             if(!chronicList){