Browse Source

Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

liucf 6 years ago
parent
commit
2272eed62c

+ 1 - 1
src/components/Advice/index.jsx

@@ -93,7 +93,7 @@ class Advice extends Component{
             {/* {advice.commontreatment && <div className={style['treat-input']}  onInput={this.handleComTreatInput}  contentEditable={true} style = {{outline: 'none'}}></div>} */}
             {<Textarea value={advice.commontreatment} isRead={isRead} handleChangeAssistValue={this.handleComTreatInput} ></Textarea>}
         </div>}
-        {!isFirstMainDiag &&<div><FollowUp  noHeader="true" textStyle={{padding: '0 10px'}}  setFollowUp={saveFollowUp} followUp = {followUp} isRead={isRead}></FollowUp></div>}
+        {!isFirstMainDiag && followUp &&<div><FollowUp  noHeader="true" textStyle={{padding: '0 10px'}}  setFollowUp={saveFollowUp} followUp = {followUp} isRead={isRead}></FollowUp></div>}
         {advice.scheme && advice.scheme.length > 0 &&<div contentEditable='false' className={style['scheme']}>
           {advice.scheme && advice.scheme.length > 0  && <h1>治疗方案</h1>}
           {scheme}

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

@@ -55,6 +55,7 @@
     position: relative;
     color:#000;
     font-weight: bold;
+    cursor: pointer;
 }
 
 .diag-up, .diag-down {

+ 1 - 1
src/components/PushItems/DetailsModal/index.jsx

@@ -40,7 +40,7 @@ class DetailsModal extends Component {
         const scrollTop = $('#detailsContent').scrollTop()
         let divHeight = 0;
         for (let i = 0; i < tipsDetails.introduceDetailList.length; i++) {
-            divHeight = divHeight + parseInt($('#' + tipsDetails.introduceDetailList[i].title).css('height'))
+            divHeight = divHeight + parseInt($('#' + tipsDetails.introduceDetailList[i].title).css('height')) -5
             if(divHeight > scrollTop) {
                 this.setState({
                     currentIndex: i

+ 8 - 3
src/components/PushItems/index.less

@@ -16,8 +16,9 @@
     .title{
       color:#fff;
       font-size: 14px;
+      font-weight: bold;
       float: left;
-      margin: 10px 10px 0 0;
+      margin: 10px 0px 0 0;
       img {
         float: left;
         margin: 1px 2px 0 20px;
@@ -27,7 +28,7 @@
     }
     .vigilantContent {
       float:left;
-      width: 340px;
+      padding: 0 0 0 15px;
       span {
         font-size: 14px;
         color: #fff;
@@ -152,6 +153,7 @@
               line-height: 14px;
               display: inline-block;
               margin: 6px;
+              cursor: pointer;
               input[type='checkbox']{
                 float: left;
                 width: 14px;
@@ -167,7 +169,10 @@
               input[type=checkbox]:checked{
                 background: url("../../common/images/checked.png")no-repeat center;
                 background-size: 12px 12px;
-             }
+              }
+              label {
+                cursor: pointer;
+              }
             }
           }
         }

+ 1 - 1
src/components/TreatDesc/DrugInfo/index.jsx

@@ -37,7 +37,7 @@ class DrugInfo extends Component {
         const scrollTop = $('#drugDesc').scrollTop()
         let divHeight = 60; //标题高度为60px
         for (let i = 0; i < drugDesc.length; i++) {
-            divHeight = divHeight + parseInt($('#' + drugDesc[i].title.trim()).css('height'))
+            divHeight = divHeight + parseInt($('#' + drugDesc[i].title.trim()).css('height')) -5
             if(divHeight > scrollTop) {
                 this.setState({
                     currentIndex: i

+ 21 - 6
src/store/actions/pushMessage.js

@@ -38,24 +38,39 @@ function getAdviceStr(advice) {
 	const commontreatment = advice.commontreatment
 	const scheme = advice.scheme || '';
 	const adviceInput = advice.adviceInput || '';
-	// const assay = advice.assay || '';
-	// const check = advice.check || '';
+	const assay = advice.assay || '';
+	const check = advice.check || '';
+	const followUp = advice.followUp || '';
 	let AdviceStr = advice.AdviceStr || '';
+
+	if(assay || check) {
+		AdviceStr = assay + check  +'; ' + AdviceStr;
+	}
+	if(commontreatment)  { 
+		AdviceStr = AdviceStr + commontreatment + ';';
+	}	
+	if(followUp) {
+		AdviceStr = AdviceStr + '回访时间:'+followUp + '后回访,不适随诊' + ';';
+	}
 	for (let i = 0; i < scheme.length; i++) {
 		for (let j = 0; j < scheme[i].treatment.length; j++) {
 			if(scheme[i].treatment[j].treatmentStr === '') {
 				AdviceStr = AdviceStr + scheme[i].treatment[j].treatmentStr
 			} else {
-				AdviceStr = AdviceStr.substring(1, AdviceStr.length) + ', ' + scheme[i].treatment[j].treatmentStr
+				AdviceStr = AdviceStr  + scheme[i].treatment[j].treatmentStr + ', '
 			}
 		}
 	}
-	if(commontreatment)  { 
-		AdviceStr = commontreatment +'; ' + AdviceStr;
-	}	
+	if(AdviceStr.slice(AdviceStr.length-2) == ', ') {
+		AdviceStr = AdviceStr.slice(0, AdviceStr.length-2)
+	}
+	// if(commontreatment)  { 
+	// 	AdviceStr = commontreatment +'; ' + AdviceStr;
+	// }	
 	if(adviceInput)  { 
 		AdviceStr = AdviceStr +'; ' + adviceInput;
 	}	
+	
 	return AdviceStr;
 }
 

+ 1 - 0
src/store/actions/treat.js

@@ -19,6 +19,7 @@ export const clearTreat = (state, action) => {
     res.treatment = [];
     res.adversReactionList=[];
     res.hasFollowUp = false;
+    res.followUp = '';
     return res
 }