Просмотр исходного кода

Merge branch 'Update/physicald' into Update/dialectical

# Conflicts:
#	src/components/TCMDiagnosis.vue
#	src/request/api.js
#	src/views/diagnosis/Prescribing.vue
cc12458 5 месяцев назад
Родитель
Сommit
0a1c28be24

+ 1 - 1
src/components/TCMDiagnosis.vue

@@ -196,7 +196,7 @@ export default {
           this.invalid_symptom = false;
           this.syndrome = "";
           this.zhengxingid = "";
-        }
+        } else if (this.therapySearchDisabled) this.getTherapiesBySymptom();
         if (!value && oldVal) {
           this.getSymptomList();
           this.getTherapyList();

+ 6 - 0
src/views/diagnosis/QuestionResult.vue

@@ -535,6 +535,12 @@ export default {
         identid: this.$route.query.pid
       });
       if (res.ResultCode == 0) {
+        if (Array.isArray(res.Data) && res.Data.length === 0) {
+          this.loading.close();
+          this.$message.warning(`体制辨识没有结果`);
+          this.$router.back();
+          return;
+        }
         this._initCharts(res.Data);
         // 排序分值最高的
         res.Data.sort((a, b) => b.score - a.score);

+ 1 - 1
src/views/diagnosis/Questions.vue

@@ -164,7 +164,7 @@ export default {
       let res = await getPhysicalQ(params);
       if (res.code == 0) {
         res.data.options.forEach(item => {
-          if (item.optioned == "f7f53719243f11e4a31cf0ebc82a76d5") {
+          if (item.optioned == "6") {
             item.checked = true;
           } else {
             item.checked = false;