bug-6 智能开方页—协定方/方剂—方剂—合方

bug-7 智能开方页—协定方/方剂—方剂—换方

src/components/ChineseMedicine.vue

@@ -2585,6 +2585,12 @@ export default {
         this.recipe_tabs[this.recipe_tabs_c].totalTableD.forEach(
           (item1, index1) => {
             if (item1.name) {
+              const getUsage = (function (list = [], value = '') {
+                if (!Array.isArray(list) || list.length === 0) return void 0;
+                const option = value && list.find(item => item.value === value || item.key == value);
+                return option ? option.key : list[0].key;
+              }).bind(null, this.usageList);
+
               res.Data.forEach((item, index) => {
                 if (item == item1.medid) {
                   item1.color = "red";
@@ -2599,7 +2605,7 @@ export default {
                     spec: item.gg, // 规格
                     dose: item.dose, // 剂量
                     unit: item.dw, // 单位
-                    usage: item.usagestr || item.usage || this.usegeList[0].key, // 用法
+                    usage: item.usagestr || item.usage, // || this.usegeList[0].key, // 用法
                     // usage: "",
                     // price: item.lsjg,
                     price: item.price,
@@ -2613,6 +2619,7 @@ export default {
                     usageList: [],
                     oldDose: item1.oldDose
                   };
+                  /* 修正 */ item1.usage = item1.useage = getUsage(item1.usage);
 
                   item1.color = "#000";
                 }

src/views/diagnosis/Prescribing.vue

@@ -3900,6 +3900,12 @@ export default {
       if (this.container_i == 0) {
         // 中药处方
         if (res.ResultCode == 0) {
+          const getUsage = (function (list = [], value = '') {
+            if (!Array.isArray(list) || list.length === 0) return void 0;
+            const option = value && list.find(item => item.value === value || item.key == value);
+            return option ? option.key : list[0].key;
+          }).bind(null, child.usageList);
+
           let noDrugs = []; // 查找不到的药品
           let hasDrugs = []; // 查找的到的药品
           res.Data.forEach((item, index) => {
@@ -3923,15 +3929,14 @@ export default {
                   pid: item1.matid,
                   color: "red",
                   dose: item1.dose,
-                  useage:
-                    item1.useage || item1.usagestr || child.usegeList[0].key,
+                  usage: item1.useage || item1.usagestr, // child.usegeList[0].key,
                   showSearch: false,
                   matid: item1.matid,
 
                   key: "",
                   search_i: index
                 };
-
+                /* 修正 */ obj.usage = obj.useage = getUsage(obj.usage);
                 noDrugs.push(obj);
                 // noDrugs.push(item1.matname)
               }
@@ -3958,7 +3963,7 @@ export default {
                 dose: item.dose, // 剂量
                 unit: item.dw, // 单位
                 // usage: item.usagestr, // 用法
-                usage: item.useage || item.usagestr || child.usegeList[0].key,
+                usage: item.useage || item.usagestr, // child.usegeList[0].key,
                 // price: item.lsjg,
                 price: item.price ? item.price : 0,
                 total: item.price * item.dose,
@@ -3970,6 +3975,7 @@ export default {
                 showSearch: false,
                 color: item.color ? item.color : "#000"
               };
+              /* 修正 */ obj1.usage = obj1.useage = getUsage(obj1.usage);
 
               child.recipe_tabs[child.recipe_tabs_c].totalTableD.push(obj1);
               child.getSelectType("中药药品用法", index);
@@ -4043,7 +4049,7 @@ export default {
                 dose: item.dose, // 剂量
                 unit: item.dw, // 单位
                 // usage: item.usagestr, // 用法
-                usage: item.useage || child.usegeList[0].key,
+                usage: item.useage || item.usagestr, // child.usegeList[0].key,
                 // price: item.lsjg,
                 price: item.price ? item.price : 0,
                 total: item.price * item.dose,
@@ -4054,6 +4060,7 @@ export default {
                 originname: item.cdmc, // 产地名称
                 showSearch: false
               };
+              /* 修正 */ obj1.usage = obj1.useage = getUsage(obj1.usage);
 
               child.recipe_tabs[child.recipe_tabs_c].totalTableD.push(obj1);
               child.getSelectType("中药药品用法", index);