|
@@ -110,7 +110,7 @@
|
|
|
</template>
|
|
|
<span>{{banText}}</span>
|
|
|
</p>
|
|
|
- <p><span>{{getDetailText(diagnose.text,false).content}}</span></p>
|
|
|
+ <p><span>{{getDetailText(diagnose.text,false).view}}</span></p>
|
|
|
</li>
|
|
|
<li v-if="tabType[moduleCP['other']]==1">
|
|
|
<h4><i></i> 其他史:</h4>
|
|
@@ -144,7 +144,7 @@ import { mapState } from 'vuex';
|
|
|
export default {
|
|
|
data() {
|
|
|
const { pathInfo, originDatas,showDoctor } = this.$store.state;
|
|
|
- let sysConfig = this.$store.state.sysConfig;console.log("showDoctor",showDoctor)
|
|
|
+ let sysConfig = this.$store.state.sysConfig;
|
|
|
let symptomDate = this.$store.state.symptom;
|
|
|
let diagnoseDate = this.$store.state.diagnose;
|
|
|
let othersDate = this.$store.state.others;
|
|
@@ -180,7 +180,7 @@ export default {
|
|
|
addBuriedSomeList:state=>state.addBuriedSomeList
|
|
|
})
|
|
|
},
|
|
|
- created(){
|
|
|
+ created(){console.log(this.$store.state)
|
|
|
this.getTime();
|
|
|
if (this.config.length == 0) {//登录进去返回到列表页,扫码返回到开始页
|
|
|
let scan = localStorage.getItem('scan');
|
|
@@ -293,14 +293,17 @@ export default {
|
|
|
tmpArr.push(symText[j].text);
|
|
|
}
|
|
|
}
|
|
|
+ const diagObj = this.getDetailText(diagnose.text,false);
|
|
|
+ const diagStr=diagObj.content;
|
|
|
+ const diagJson=diagObj.contentJson;
|
|
|
tmpStr?tmpArr.push(tmpStr):null;
|
|
|
- detailList[1].content=tmpArr.join();
|
|
|
- detailList[1].contentJson=JSON.stringify(tmpArr);
|
|
|
+ detailList[1].content=tmpArr.join()+","+diagStr;
|
|
|
+ detailList[1].contentJson=JSON.stringify(tmpArr.concat(diagJson));
|
|
|
detailList[1].contentValue=tmpArr.join();
|
|
|
}else if(i == 2){
|
|
|
detailList[2] = this.getDetailText(others.text,3)
|
|
|
}else if(i == 3){
|
|
|
- detailList[3]=this.getDetailText(others.text,4);
|
|
|
+ detailList[3]=this.getDetailText(addContent.text,4);
|
|
|
}
|
|
|
}
|
|
|
let params = {
|