鉴别诊断

src/components/DiagnosticList/index.jsx

@@ -263,7 +263,7 @@ class DiagnosticList extends Component {
         return(
                 <div className={style['diaglist-wrap']}>
                     {list && (list.length > 0) && list.map((item, index) => {
-                        const hasTreat = item.treat && (item.treat.commonTreatment.content || item.treat.surgeryTreatment.content || item.treat.treatment.length>0 ||(item.adverseReactions&&item.adverseReactions.length > 0)
+                        const hasTreat = item.treat && ((item.treat.commonTreatment&&item.treat.commonTreatment.content) || (item.treat.surgeryTreatment&&item.treat.surgeryTreatment.content) || item.treat.treatment.length>0 ||(item.adverseReactions&&item.adverseReactions.length > 0)
                            || (item.drugHistory && item.drugHistory['慢病用药内容'] &&  item.drugHistory['慢病用药内容'].length > 0) || (item.drugHistory &&item.drugHistory['普通病用药内容'] &&  item.drugHistory['普通病用药内容'].length > 0) ||item.follow)
                         isChronic = chronicLine&&item.type==2&&chronicList.findIndex((it)=>it.conceptId==item.conceptId)!=-1;
                         return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.conceptId} >

src/components/PushItems/index.jsx

@@ -5,8 +5,7 @@ import doubtImg from "../../common/images/doubt.png";
 import recommendImg from "../../common/images/recommend.png";
 import tipsImg from "../../common/images/tips.png";
 import vigilantImg from "../../common/images/vigilant.png";
-import showImg from "../../common/images/show.png";
-import hideImg from "../../common/images/close.png";
+import likelyImg from "../../common/images/likely.png";
 import DetailsModal from './DetailsModal';
 import PushDiag from "./PushDiag";
 import DiagnosticItem from "@containers/DiagnosticItem";
@@ -144,6 +143,7 @@ class PushItems extends Component {
       determine,
       doubt,
       possible,
+      likely,
       assay,
       check,
       tips,
@@ -196,6 +196,15 @@ class PushItems extends Component {
                 maxShowNum={24}
               />
             )}
+            {likely && likely.length > 0 && (
+              <PushDiag
+                titleBg="#FAEBEC"
+                icon={likelyImg}
+                title="鉴别诊断"
+                diagList={likely}
+                maxShowNum={24}
+              />
+            )}
             <div className={style["diagnose"]}>
               {vigilant.length === 0 &&
                 determine.length === 0 &&

src/store/actions/pushMessage.js

@@ -28,6 +28,7 @@ export const setAdvice=(state,action)=>{
   res.doubt = action.determine.concat(action.doubt);
   res.possible = action.possible;
   res.vigilant = action.vigilant;
+  res.likely = action.likely;
   res.assay = action.lab;
 	res.check = action.pacs;
   return res;

src/store/async-actions/pushMessage.js

@@ -45,11 +45,13 @@ export const billing = (mdata,boxMark) => {
         let vigilant=[], //警惕
              doubt=[],    //疑似诊断
             possible = [],  //可能诊断
-            determine=[]; //确诊
+            determine=[], //确诊
+            likely=[];//  鉴别诊断
             doubt = dis&&dis['疑似诊断'],
             possible = dis&&dis['可能诊断'];
             vigilant = dis&&dis['警惕'];
             determine = dis&&dis['确诊']; //确诊
+            likely = dis&&dis['鉴别诊断'];
         if(lab) {
             for(let i = 0; i < lab.length; i++) {
                 lab[i].checked = false
@@ -71,6 +73,7 @@ export const billing = (mdata,boxMark) => {
             doubt: doubt||[],
             possible: possible||[],
             vigilant: vigilant||[],
+            likely:likely||[],
             lab: lab||[],
             pacs: pacs||[],
         });