zhangxc 6 lat temu
rodzic
commit
cfb582bb5b

+ 1 - 0
src/components/DiagnosticList/index.jsx

@@ -151,6 +151,7 @@ class DiagnosticList extends Component {
                 <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)
+                        // const hasTreat= true;
                         return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.id} >
                                     {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img className={style["diag-up"]} src={diagUp}/></span>}
                                     {list.length === 1 ? '' : index !== 0 ? '' : <span onClick={() => {this.downDiagnostic(index)}} className={style['diag-down']}><img className={style["diag-down"]} src={diagDown}/></span>}

+ 4 - 4
src/components/Treat/AdverseReactions/index.jsx

@@ -52,10 +52,10 @@ class AdverseReactions extends Component {
                 <div className={style['last-treat-title']} ><img className={style['last-treat-icon']} src={icon}/>{title}</div>
                 {adversReactionList.map((item, index) => {
                     return (<div key={item.id}><span>{item.tagName}:</span>
-                        {item.details.map((item, index) => {
-                            return <span key={item.name}>
-                                <input type="checkbox" checked={item.checked} id={item.name} onChange={()=>{console.log('change')}}/>
-                                <label for={item.name}> {item.name} </label>
+                        {item.details.map((it, index) => {
+                            return <span key={item.id + it.name}>
+                                <input type="checkbox" checked={item.checked} id={item.id + it.name} onChange={()=>{console.log('change')}}/>
+                                <label for={item.id + it.name}> {it.name} </label>
                             </span>
                         })}
                     </div>)

+ 2 - 2
src/components/Treat/index.jsx

@@ -65,8 +65,8 @@ class Treat extends Component {
 
                     <div className={style['treat-inner-box']}>
                         <GeneralTreat icon={generalIcon} title='一般治疗'   generalTreat={generalTreat}></GeneralTreat>
-                        {/* <LastTreat icon={generalIcon} title='上次用药情况' lastTreat={lastTreat}  showDrugInfo = {showDrugInfo} setDrugInfo={ setDrugInfo }></LastTreat>
-                        <AdverseReactions icon={generalIcon} title='不良反应' adversReactionList = {adversReactionList}></AdverseReactions> */}
+                        <LastTreat icon={generalIcon} title='上次用药情况' lastTreat={lastTreat}  showDrugInfo = {showDrugInfo} setDrugInfo={ setDrugInfo }></LastTreat>
+                        <AdverseReactions icon={generalIcon} title='不良反应' adversReactionList = {adversReactionList}></AdverseReactions>
                         <DrugTreat treatment={ treatment } 
                                 selectDrug={selectDrug} 
                                 setOtherRecommend={ setOtherRecommend } 

+ 31 - 7
src/store/reducers/treat.js

@@ -99,7 +99,23 @@ const initState = {
             controlType: 2,
             details: [
                 {
-                    name: "无",
+                    name: "否",
+                    value: 0
+                },
+                {
+                    name: "是",
+                    value: 0
+                },
+                {
+                    name: "轻度",
+                    value: 0
+                },
+                {
+                    name: "中度",
+                    value: 0
+                },
+                {
+                    name: "重度",
                     value: 0
                 },
                 {
@@ -107,7 +123,7 @@ const initState = {
                     value: 0
                 },
                 {
-                    name: "频",
+                    name: "频",
                     value: 0
                 }
             ]
@@ -121,23 +137,31 @@ const initState = {
             controlType: 2,
             details: [
                 {
-                    name: "腹胀 ",
+                    name: "否",
+                    value: 0
+                },
+                {
+                    name: "是",
                     value: 0
                 },
                 {
-                    name: "厌食",
+                    name: "轻度",
                     value: 0
                 },
                 {
-                    name: "嗳气",
+                    name: "中度",
                     value: 0
                 },
                 {
-                    name: "恶心",
+                    name: "重度",
+                    value: 0
+                },
+                {
+                    name: "偶尔",
                     value: 0
                 },
                 {
-                    name: "呕吐",
+                    name: "频繁",
                     value: 0
                 }
             ]