Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/data/prescription.vue

@@ -85,17 +85,17 @@
                     <el-input v-model="addPlan.blood_flow_volume" ></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.template_id == 6">
-                  <el-form-item label="目标超滤量(ml) : ">
-                    <el-input v-model="addPlan.target_ultrafiltration" type="number" ></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.template_id != 6">
-                  <el-form-item label="目标超滤量(L) : ">
-                    <el-input v-model="addPlan.target_ultrafiltration" type="number" ></el-input>
-                  </el-form-item>
-                </el-col>
+                <!--<el-col :span="8" v-if="this.$store.getters.xt_user.template_info.template_id == 6">-->
+                  <!--<el-form-item label="目标超滤量(ml) : ">-->
+                    <!--<el-input v-model="addPlan.target_ultrafiltration" type="number" ></el-input>-->
+                  <!--</el-form-item>-->
+                <!--</el-col>-->
+
+                <!--<el-col :span="8" v-if="this.$store.getters.xt_user.template_info.template_id != 6">-->
+                  <!--<el-form-item label="目标超滤量(L) : ">-->
+                    <!--<el-input v-model="addPlan.target_ultrafiltration" type="number" ></el-input>-->
+                  <!--</el-form-item>-->
+                <!--</el-col>-->
 
 
                 <el-col :span="8">

src/xt_pages/user/components/PatientForm.vue

@@ -752,10 +752,10 @@ const defaultForm = {
     {
       id: 0,
       item: "",
-      item_id: 104,
-      item_name: "甲型肝抗体测定（Anti-HAV:各种免疫方法)",
+      item_id: 60,
+      item_name: "丙型肝炎病毒核心抗体(AntiHCV)",
       project_id: 14,
-      project_name: "甲肝乙肝丙肝梅毒HIV",
+      project_name: "传染病检查",
       range_type: 2,
       select_options: ["阴性", "阳性", "弱阳性"],
       unit: "",
@@ -764,10 +764,10 @@ const defaultForm = {
     {
       id: 0,
       item: "",
-      item_id: 105,
-      item_name: "乙型肝炎表面抗原测定(HBsAg:酶标法)",
+      item_id: 62,
+      item_name: "乙型肝炎病毒表面抗原(HBsAg)",
       project_id: 14,
-      project_name: "甲肝乙肝丙肝梅毒HIV",
+      project_name: "传染病检查",
       range_type: 2,
       select_options: ["阴性", "阳性", "弱阳性"],
       unit: "",
@@ -776,10 +776,10 @@ const defaultForm = {
     {
       id: 0,
       item: "",
-      item_id: 106,
-      item_name: "乙型肝炎表面抗体测定(Anti-HBs:酶标法)",
+      item_id: 63,
+      item_name: "乙型肝炎病毒表面抗体(AntiHBs）",
       project_id: 14,
-      project_name: "甲肝乙肝丙肝梅毒HIV",
+      project_name: "传染病检查",
       range_type: 2,
       select_options: ["阴性", "阳性", "弱阳性"],
       unit: "",
@@ -788,10 +788,10 @@ const defaultForm = {
     {
       id: 0,
       item: "",
-      item_id: 107,
-      item_name: "乙型肝炎e抗原测定(HBeAg:酶标法)",
+      item_id: 64,
+      item_name: "乙型肝炎病毒E抗原(HBeAg）",
       project_id: 14,
-      project_name: "甲肝乙肝丙肝梅毒HIV",
+      project_name: "传染病检查",
       range_type: 2,
       select_options: ["阴性", "阳性", "弱阳性"],
       unit: "",
@@ -800,10 +800,10 @@ const defaultForm = {
     {
       id: 0,
       item: "",
-      item_id: 108,
-      item_name: "乙型肝炎e抗体测定(Anti-Hbe:酶标法)",
+      item_id: 65,
+      item_name: "乙型肝炎病毒E抗体(AntiHBe)",
       project_id: 14,
-      project_name: "甲肝乙肝丙肝梅毒HIV",
+      project_name: "传染病检查",
       range_type: 2,
       select_options: ["阴性", "阳性", "弱阳性"],
       unit: "",
@@ -812,10 +812,10 @@ const defaultForm = {
     {
       id: 0,
       item: "",
-      item_id: 109,
-      item_name: "乙型肝炎核心抗体测定(Anti-HBc)",
+      item_id: 66,
+      item_name: "乙型肝炎病毒核心抗体(AntiHBc)",
       project_id: 14,
-      project_name: "甲肝乙肝丙肝梅毒HIV",
+      project_name: "传染病检查",
       range_type: 2,
       select_options: ["阴性", "阳性", "弱阳性"],
       unit: "",
@@ -824,10 +824,10 @@ const defaultForm = {
     {
       id: 0,
       item: "",
-      item_id: 110,
-      item_name: "丙型肝炎抗体测定(Anti-HCV:定性)",
+      item_id: 111,
+      item_name: "HIV抗体",
       project_id: 14,
-      project_name: "甲肝乙肝丙肝梅毒HIV",
+      project_name: "传染病检查",
       range_type: 2,
       select_options: ["阴性", "阳性", "弱阳性"],
       unit: "",
@@ -836,10 +836,10 @@ const defaultForm = {
     {
       id: 0,
       item: "",
-      item_id: 111,
-      item_name: "人类免疫缺陷病毒抗体测定(Anti-HIV)",
+      item_id: 112,
+      item_name: "梅毒",
       project_id: 14,
-      project_name: "甲肝乙肝丙肝梅毒HIV",
+      project_name: "传染病检查",
       range_type: 2,
       select_options: ["阴性", "阳性", "弱阳性"],
       unit: "",
@@ -848,24 +848,24 @@ const defaultForm = {
     {
       id: 0,
       item: "",
-      item_id: 112,
-      item_name: "梅毒螺旋体特异抗体测定(凝集,印迹法)",
+      item_id: 178,
+      item_name: "乙型病毒DNA测定(HBVDNH）",
       project_id: 14,
-      project_name: "甲肝乙肝丙肝梅毒HIV",
-      range_type: 2,
-      select_options: ["阴性", "阳性", "弱阳性"],
+      project_name: "传染病检查",
+      range_type: 1,
+      select_options: 0,
       unit: "",
       value: ""
     },
     {
       id: 0,
       item: "",
-      item_id: 113,
-      item_name: "快速血浆反应素试验(RPR)",
+      item_id: 179,
+      item_name: "丙型病毒DNA测定(HCVDNH",
       project_id: 14,
-      project_name: "甲肝乙肝丙肝梅毒HIV",
-      range_type: 2,
-      select_options: ["阴性", "阳性", "弱阳性"],
+      project_name: "传染病检查",
+      range_type: 1,
+      select_options: 0,
       unit: "",
       value: ""
     }

src/xt_pages/user/dialysisSolution.vue

@@ -188,17 +188,17 @@
               <el-input v-model="addPlan.blood_flow_volume"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShows('目标超滤量')&&this.$store.getters.xt_user.template_info.template_id == 6">
-            <el-form-item label="目标超滤量(ml) : ">
-              <el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8" v-if="isShows('目标超滤量')&&this.$store.getters.xt_user.template_info.template_id != 6">
-            <el-form-item label="目标超滤量(L) : ">
-              <el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="8" v-if="isShows('目标超滤量')&&this.$store.getters.xt_user.template_info.template_id == 6">-->
+            <!--<el-form-item label="目标超滤量(ml) : ">-->
+              <!--<el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col :span="8" v-if="isShows('目标超滤量')&&this.$store.getters.xt_user.template_info.template_id != 6">-->
+            <!--<el-form-item label="目标超滤量(L) : ">-->
+              <!--<el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
 
           <el-col :span="8" v-if="isShows('透析液配方')">

src/xt_pages/user/doctorAdvice.vue

@@ -3191,6 +3191,7 @@ export default {
     },
     selectAdvice(selection, row) {
       if (this.adviceType != 3) {
+
         this.lstableData = [];
       } else if (this.adviceType != 1) {
         this.cqtableData = [];