修复影像

.env.development

@@ -10,12 +10,15 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://192.168.3.142:8080/api'
 # VUE_APP_BASE_WSS = 'ws://192.168.3.142:8002/ws'
 
+VUE_APP_BASE_API = 'http://192.168.3.242:8081/api'
+VUE_APP_BASE_WSS = 'ws://192.168.3.242:8081/ws'
+
 # VUE_APP_BASE_API = 'http://106.74.15.131:81/api'
 # VUE_APP_BASE_WSS = 'ws://106.74.15.131:81/ws'
 
 # VUE_APP_BASE_API = 'http://192.168.3.21:8080/api'
-VUE_APP_BASE_API = 'http://39.105.121.97:8080/api'
-VUE_APP_BASE_WSS = 'ws://39.105.121.97:8080/ws'
+# VUE_APP_BASE_API = 'http://39.105.121.97:8080/api'
+# VUE_APP_BASE_WSS = 'ws://39.105.121.97:8080/ws'
 
 
 # 路由懒加载

src/utils/request.js

@@ -18,11 +18,11 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API,
   // baseURL: "http://39.105.121.97:8080/api",
-  // baseURL: "http://106.74.15.131:81/api",
+  // baseURL: "http://106.74.15.131:80/api",
   
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // baseURL: "http://192.168.3.142:8080/api",
-  // baseURL: "http://192.168.3.90:8080/api",
+  // baseURL: "http://192.168.3.242:8081/api",
   // baseURL: "http://172.16.100.153:8081/api",
   // baseURL: "http://192.168.97.176:8081/api",
   // baseURL: "http://j41711d831.wicp.vip/api",
@@ -127,16 +127,16 @@ service.interceptors.response.use(res => {
       Notification.error({ title: msg })
       return Promise.reject('error')
     } else {
-      // if(res.data.msg && res.data.msg ==="退出成功"){
-      //   return res.data
-      // } else {
-      //   if(JSON.parse(cyptoTool.methods.decrypt(res.data)).code === 500) {
-      //     JSON.parse(cyptoTool.methods.decrypt(res.data)) 
-      //     return Message.error(JSON.parse(cyptoTool.methods.decrypt(res.data)).msg)
-      //   }
-      //   return  JSON.parse(cyptoTool.methods.decrypt(res.data)) 
-      // }
-      return res.data
+      if(res.data.msg && res.data.msg ==="退出成功"){
+        return res.data
+      } else {
+        if(JSON.parse(cyptoTool.methods.decrypt(res.data)).code === 500) {
+          JSON.parse(cyptoTool.methods.decrypt(res.data)) 
+          return Message.error(JSON.parse(cyptoTool.methods.decrypt(res.data)).msg)
+        }
+        return  JSON.parse(cyptoTool.methods.decrypt(res.data)) 
+      }
+      // return res.data
     }
   },
   error => {

src/views/patientCenter/index.vue

@@ -895,6 +895,47 @@ export default {
       this.historyFlag = false
       this.$refs.medicalRef.initMedicalRecordList()
       this.$refs.addMedicalDialogRef.allList = []
+
+
+      this.chiefComplaintContent=""
+      this.chiefComplaintStr=[]
+      this.chiefComplaintOptions={}
+      this.chiefComplaintMap= new Map()
+
+      this.presentIllnessContent=""
+      this.presentIllnessStr=[]
+      this.presentIllnessOptions={}
+      this.presentIllnessMap= new Map()
+
+      this.inspectContent=""
+      this.inspectStr=[]
+      this.inspectOptions={}
+      this.inspectMap= new Map()
+
+      this.diagnosisContent=""
+      this.diagnosisStr=[]
+      this.diagnosisOptions={}
+      this.diagnosisMap= new Map()
+
+      this.treatmentPlanningContent=""
+      this.treatmentPlanningStr=[]
+      this.treatmentPlanningOptions={}
+      this.treatmentPlanningMap= new Map()
+
+      this.imageInspectContent=""
+      this.imageInspectStr=[]
+      this.imageInspectOption={}
+      this.imageInspectMap= new Map()
+
+      this.disposeContent=""
+      this.disposeStr=[]
+      this.disposeOptions={}
+      this.disposeMap= new Map()
+
+      this.noteContent=""
+      this.noteStr=[]
+      this.noteOptions={}
+      this.noteMap= new Map()
     },
     handleClick(val) {
       this.activeName = val.value
@@ -976,7 +1017,48 @@ export default {
           this.isLookObj = {}
           this.teethList = []
           this.yaAllList = []
+          this.$refs.addMedicalDialogRef.allList = []
           this.$refs.addMedicalTreeDialogRef.listArr = []
+
+          this.chiefComplaintContent=""
+          this.chiefComplaintStr=[]
+          this.chiefComplaintOptions={}
+          this.chiefComplaintMap= new Map()
+
+          this.presentIllnessContent=""
+          this.presentIllnessStr=[]
+          this.presentIllnessOptions={}
+          this.presentIllnessMap= new Map()
+
+          this.inspectContent=""
+          this.inspectStr=[]
+          this.inspectOptions={}
+          this.inspectMap= new Map()
+
+          this.diagnosisContent=""
+          this.diagnosisStr=[]
+          this.diagnosisOptions={}
+          this.diagnosisMap= new Map()
+
+          this.treatmentPlanningContent=""
+          this.treatmentPlanningStr=[]
+          this.treatmentPlanningOptions={}
+          this.treatmentPlanningMap= new Map()
+
+          this.imageInspectContent=""
+          this.imageInspectStr=[]
+          this.imageInspectOption={}
+          this.imageInspectMap= new Map()
+
+          this.disposeContent=""
+          this.disposeStr=[]
+          this.disposeOptions={}
+          this.disposeMap= new Map()
+
+          this.noteContent=""
+          this.noteStr=[]
+          this.noteOptions={}
+          this.noteMap= new Map()
           setTimeout(() => {
             this.$refs.medicalRef.initMedicalRecordList()
           }, 100)
@@ -1134,7 +1216,6 @@ export default {
         (item) => item.toothPosition != this.yaKey
       )
 
-      console.log(list,123213);
       this.yaAllList.push({
         toothPosition: this.yaKey,
         toothStatus: 2,
@@ -1229,7 +1310,7 @@ export default {
         this.imageInspectMap.set("_" + list.imageInspectContent,str)
         this.imageInspectContent = this.imageInspectContent.replace(imageInspectOptionStr,str)
         this.imageInspectStr = this.imageInspectStr.map(item=>{
-          if(item.value == imageInspectOptionsStr){
+          if(item.value == imageInspectOptionStr){
             item.value = str
           }
           return item
@@ -1238,7 +1319,7 @@ export default {
         this.imageInspectMap.set("_" + list.imageInspectContent,this.initToothPosition(this.yaKey))
         this.imageInspectContent = this.imageInspectContent + this.initToothPosition(this.yaKey) + list.imageInspectContent
         this.imageInspectStr = [...this.imageInspectStr,{type:'string',value:this.initToothPosition(this.yaKey)},...list.imageInspectOption.str]
-        this.imageInspectOptions = Object.assign(this.imageInspectOption, list.imageInspectOption.dic_data);
+        this.imageInspectOption = Object.assign(this.imageInspectOption, list.imageInspectOption.dic_data);
       }
 
       // 判断是否有相同的合并内容 如果相同则直接合并如果不同加新的合并内容 //处置
@@ -1291,8 +1372,25 @@ export default {
         this.diagnosisContent = this.diagnosisContent + this.initToothPosition(this.yaKey) + "主诊断：" + list.mainDiagnosis + (list.otherDiagnosis ? "其他诊断：" + list.otherDiagnosis.join() : "")
         this.diagnosisStr = [{type:'string',value:this.diagnosisContent}]
       }
+      
 
       this.$nextTick(() => {
+        console.log(
+          this.imageInspectContent,
+          this.imageInspectStr,
+          this.imageInspectOption,
+          this.imageInspectMap,
+          "影像检查的合并内容"
+        );
+        console.log(
+          this.noteContent,
+          this.noteStr,
+          this.noteOptions,
+          this.noteMap,
+          "便签的map"
+        );
+
+
         this.addyaFlag = true
         this.historyFlag = false
         this.isLook = true

src/views/patientCenter/medical/yaChi.vue

@@ -3240,6 +3240,10 @@ export default {
       type: String,
       default: ''
     },
+    imageInspectContent: {
+      type: String,
+      default: ''
+    },
     noteStr: {
       type: Array,
       default: []
@@ -3396,6 +3400,7 @@ export default {
         }
       })
       text = newVal.replace(/\s/g, '')
+      console.log(text);
       this.$emit('changeImageingInspect', text)
     },
     changeTreatmentPlanning() {
@@ -3561,7 +3566,6 @@ export default {
       })
         .then(async () => {
           let obj = {}
-          console.log(this.tagList,'this.allList');
           if (this.updateId) {
             this.tagList.forEach((item) => {
                 item.toothPosition = item.toothPosition
@@ -3589,6 +3593,7 @@ export default {
                 treatmentPlanningContent: this.treatmentPlanningContent,
                 disposeContent: this.disposeContent,
                 noteContent: this.noteContent,
+                imageInspectContent: this.imageInspectContent,
                 diagnosisContent: this.diagnosisContent,
                 doctorPastHistory: this.allList[0].patientPastHistory,
                 doctorFamilyHistory: this.allList[0].patientFamilyHistory,
@@ -3610,6 +3615,7 @@ export default {
                 treatmentPlanningContent: this.treatmentPlanningContent,
                 disposeContent: this.disposeContent,
                 noteContent: this.noteContent,
+                imageInspectContent: this.imageInspectContent,
                 diagnosisContent: this.diagnosisContent,
                 toothList: this.tagList,
                 id: this.updateId
@@ -3622,8 +3628,6 @@ export default {
             this.allList = []
             this.$message.success(`${status==1?'保存':'提交'}成功!`)
           } else {
-            console.log(this.allList, 'this.allList')
-            console.log(this.tagList, 'this.tagList')
             // let arr = []
             // this.allList.forEach((item) => {
             //   arr.push({
@@ -3649,8 +3653,6 @@ export default {
             })
 
             if (this.visitType === 1) {
-              console.log(this.allList[0],"this.allList[0]");
-              console.log(this.allList[0].patientPastHistory,"this.allList[0].patientPastHistory");
               obj = {
                 patientId: this.ids,
                 status,
@@ -3664,6 +3666,7 @@ export default {
                 treatmentPlanningContent: this.treatmentPlanningContent,
                 disposeContent: this.disposeContent,
                 noteContent: this.noteContent,
+                imageInspectContent: this.imageInspectContent,
                 diagnosisContent: this.diagnosisContent,
                 doctorPastHistory: this.allList[0].patientPastHistory,
                 doctorFamilyHistory: this.allList[0].patientFamilyHistory,
@@ -3684,6 +3687,7 @@ export default {
                 treatmentPlanningContent: this.treatmentPlanningContent,
                 disposeContent: this.disposeContent,
                 noteContent: this.noteContent,
+                imageInspectContent: this.imageInspectContent,
                 diagnosisContent: this.diagnosisContent,
                 toothList: this.tagList
               }