|
|
@@ -1183,6 +1183,7 @@ import { setTimeout } from "timers";
|
|
|
import prescribing from "../../utils/minix/prescribing";
|
|
|
|
|
|
import {formatPicture} from "@/utils/picture";
|
|
|
+import {CC_Dosage2Basis} from '@/utils/medicine';
|
|
|
|
|
|
export default {
|
|
|
mixins: [prescribing],
|
|
|
@@ -2542,7 +2543,8 @@ export default {
|
|
|
originname: item.cdmc, // 产地名称
|
|
|
showSearch: false
|
|
|
};
|
|
|
-
|
|
|
+ obj1.ggnum = +item.ggnum || 1;
|
|
|
+ obj1.xbzxs = +item.xbzxs || '34'.includes(item.zylx) ? obj1.ggnum : 1;
|
|
|
data1.recipe_tabs[data1.recipe_tabs_c].totalTableD.push(obj1);
|
|
|
data1.getSelectType("中药药品用法", index);
|
|
|
});
|
|
|
@@ -2828,8 +2830,8 @@ export default {
|
|
|
const is = recipe.medicine.every(m => m.matid);
|
|
|
if (is) {
|
|
|
// 调用 方剂 换方
|
|
|
- const medicine = recipe.medicine.map((m, i) => {
|
|
|
- return {
|
|
|
+ const medicines = recipe.medicine.map((m, i) => {
|
|
|
+ const medicine = {
|
|
|
matid: m.matid,
|
|
|
matname: m.ypmc,
|
|
|
dose: m.dose,
|
|
|
@@ -2837,9 +2839,12 @@ export default {
|
|
|
useage: m.usagestr,
|
|
|
seqn: i + 1,
|
|
|
}
|
|
|
+ medicine.ggnum = +m.ggnum || 1;
|
|
|
+ medicine.xbzxs = +m.xbzxs || '34'.includes(m.zylx) ? medicine.ggnum : 1;
|
|
|
+ return medicine;
|
|
|
});
|
|
|
if (recipe.__RecipeFrom__ === '2') this.agreeAssignToTCM(recipe, void 0, true);
|
|
|
- this.setDrugsInfo(medicine);
|
|
|
+ this.setDrugsInfo(medicines);
|
|
|
this.changeAndJoin(1);
|
|
|
} else if (recipe.__RecipeFrom__ === '2') {
|
|
|
this.agreeInfo = recipe;
|
|
|
@@ -2930,7 +2935,8 @@ export default {
|
|
|
originname: item.cdmc, // 产地名称
|
|
|
showSearch: false
|
|
|
};
|
|
|
-
|
|
|
+ obj1.ggnum = +item.ggnum || 1;
|
|
|
+ obj1.xbzxs = +item.xbzxs || '34'.includes(item.zylx) ? obj1.ggnum : 1;
|
|
|
data1.recipe_tabs[data1.recipe_tabs_c].totalTableD.push(obj1);
|
|
|
data1.getSelectType("中药药品用法", index);
|
|
|
});
|
|
|
@@ -4009,7 +4015,8 @@ export default {
|
|
|
|
|
|
let ids = [];
|
|
|
drugs.forEach(item => {
|
|
|
- let idDose = item.matid + "&" + item.dose + "&" + (item.useage || "");
|
|
|
+ item.oldDose = CC_Dosage2Basis(item);
|
|
|
+ let idDose = item.matid + "&" + item.oldDose + "&" + (item.useage || "");
|
|
|
ids.push(idDose);
|
|
|
});
|
|
|
|
|
|
@@ -4067,12 +4074,15 @@ export default {
|
|
|
key: "",
|
|
|
search_i: index
|
|
|
};
|
|
|
+ obj.oldDose = item1.oldDose;
|
|
|
/* 修正 */ obj.usage = obj.useage = getUsage(obj.usage);
|
|
|
noDrugs.push(obj);
|
|
|
// noDrugs.push(item1.matname)
|
|
|
}
|
|
|
|
|
|
if (item instanceof Object && item.oldYpid == item1.matid) {
|
|
|
+ item.ggnum = +item.ggnum || 1;
|
|
|
+ item.xbzxs = +item.xbzxs || '34'.includes(item.zylx) ? item.ggnum : 1;
|
|
|
if (item.kc > 0) hasDrugs.push(item);
|
|
|
else {
|
|
|
item.color = 'red';
|
|
|
@@ -4111,6 +4121,8 @@ export default {
|
|
|
color: item.color ? item.color : "#000"
|
|
|
};
|
|
|
/* 修正 */ obj1.usage = obj1.useage = getUsage(obj1.usage);
|
|
|
+ obj1.ggnum = +item.ggnum || 1;
|
|
|
+ obj1.xbzxs = +item.xbzxs || '34'.includes(item.zylx) ? obj1.ggnum : 1;
|
|
|
|
|
|
child.recipe_tabs[child.recipe_tabs_c].totalTableD.push(obj1);
|
|
|
child.getSelectType("中药药品用法", index);
|
|
|
@@ -4196,6 +4208,8 @@ export default {
|
|
|
showSearch: false
|
|
|
};
|
|
|
/* 修正 */ obj1.usage = obj1.useage = getUsage(obj1.usage);
|
|
|
+ obj1.ggnum = +item.ggnum || 1;
|
|
|
+ obj1.xbzxs = +item.xbzxs || '34'.includes(item.zylx) ? obj1.ggnum : 1;
|
|
|
|
|
|
child.recipe_tabs[child.recipe_tabs_c].totalTableD.push(obj1);
|
|
|
child.getSelectType("中药药品用法", index);
|