Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/views/basic-dictionary/DeviceType.vue

@@ -105,13 +105,22 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="一位字符" prop="checkTypeFlag">
-                  <el-input
+                <el-form-item label="检查类别" prop="checkTypeFlag">
+                  <!-- <el-input
                     v-model="form.checkTypeFlag"
                     maxlength="1"
                     show-word-limit
                     style="width: 80%"
-                  ></el-input>
+                  ></el-input> -->
+                  <el-select v-model="form.checkTypeFlag" placeholder="请选择">
+                    <el-option
+                      v-for="item in dict.checkTypeFlag"
+                      :key="item.id"
+                      :label="item.displayName"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <div style="margin-top: 70px">
@@ -185,6 +194,7 @@
   </div>
 </template>
 <script>
+import { mapState } from "vuex";
 import Sortable from "sortablejs";
 import {
   instrumentlist,
@@ -205,6 +215,7 @@ export default {
         displayName: "",
         checkTypeFlag: "",
       },
+
       title: 1,
       dialogVisible: false,
       tableData: [],
@@ -226,8 +237,12 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapState(["dict"]),
+  },
   created() {
     this.getlist();
+    console.log(this.dict);
   },
   mounted() {
     window.onresize = () => {
@@ -401,7 +416,7 @@ export default {
     add() {
       this.dialogVisible = true;
       this.title = 1;
-      this.form={}
+      this.form = {};
     },
     //获取列表
     getlist() {

src/views/basic-dictionary/ResultStatus.vue

@@ -316,7 +316,7 @@ export default {
       this.dialogVisible = true;
       this.title = 2;
       console.log(row);
-      // this.form = row;
+      this.form = row;
     },
     //q确定
     confirmsubmission() {

src/views/common-settings/SampleGroup.vue

@@ -25,7 +25,6 @@
           </el-table-column>
           <el-table-column prop="lastModifierName" label="修改者">
           </el-table-column>
-
           <el-table-column
             prop="lastModificationTime"
             label="修改时间"
@@ -440,7 +439,7 @@ export default {
       this.isdislob = false;
       this.rightdata.splice(this.num, 1);
       this.ites.push(item);
-      this.isdislob = true;
+      this.isdislob = false;
       this.updatedate();
     },
     //右侧点击选中
@@ -459,7 +458,7 @@ export default {
       if (this.rightdata.length > 0) {
         this.rightdata.splice(this.num, 1);
         this.ites.push(this.leftobj);
-        this.isdislob = true;
+        this.isdislob = false;
         this.updatedate();
       }
     },
@@ -482,6 +481,7 @@ export default {
     //科室选择
     ischangs(v) {
       itemtypeid(v).then((res) => {
+        this.ites=res.data
         let dq = res.data;
         if (dq.length > 0) {
           dq.forEach((element) => {
@@ -521,7 +521,7 @@ export default {
           // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置
           result.push({ id: item.id, displayOrder: currentDisplayOrder });
         }
-      });
+      }); 
       // console.log('assertion', result);
       barcodedraganddrop({ itemList: result }).then((res) => {
         this.$message.success("操作成功");

src/views/fee-settings/Diagnosis.vue

@@ -560,12 +560,15 @@ export default {
       } else {
         //项目类别
         projectlist().then((res) => {
-          this.itemTypeId = res.data.items;
+          this.itemTypeId = res.data;
         });
-        //性别
-        examinationgender().then((res) => {
+        //适用性别
+        getapi('/api/app/for-sex').then(res=>{
           this.forSexId = res.data;
-        });
+        })
+        // examinationgender().then((res) => {
+        //   this.forSexId = res.data;
+        // });
         //诊断级别
         diagsislist().then((res) => {
           this.diagnosisLevelId = res.data.items;
@@ -606,12 +609,16 @@ export default {
       //项目类别
       projectlist().then((res) => {
         this.itemTypeId = res.data;
-        console.log(res);
       });
-      //性别
-      examinationgender().then((res) => {
+      //适用性别
+      getapi('/api/app/for-sex').then(res=>{
         this.forSexId = res.data;
-      });
+        console.log('适用性别',res);
+      })
+      // examinationgender().then((res) => {
+      //   this.forSexId = res.data;
+      //   console.log(res, "性别");
+      // });
       //诊断级别
       diagsislist().then((res) => {
         this.diagnosisLevelId = res.data.items;

src/views/fee-settings/DiagnosisTemplate.vue

@@ -567,6 +567,11 @@ export default {
           });
         }
       });
+      //诊断模板包含的诊断
+      getapi(`/api/app/diagnosis-template-detail/diagnosis-template-in-diagnosis?DiagnosisTemplateId=${row.id}`).then(res=>{
+        this.rightdata=res.data
+        console.log(res,'诊断');
+      })
       console.log(row);
     },
     getlist() {

src/views/fee-settings/Item.vue

@@ -130,7 +130,11 @@
                 :show-all-levels="false"
               >
               </el-cascader> -->
-              <el-select v-model="form.itemTypeId" placeholder="请选择" style="width:100%">
+              <el-select
+                v-model="form.itemTypeId"
+                placeholder="请选择"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in itemTypeId"
                   :key="item.id"
@@ -148,7 +152,11 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="价表项目编码" prop="priceItemId">
-              <el-select v-model="form.priceItemId" placeholder="请选择" style="width:100%">
+              <el-select
+                v-model="form.priceItemId"
+                placeholder="请选择"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in priceItemId"
                   :key="item.id"
@@ -160,8 +168,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="单位" prop="unitId">
-              <el-select v-model="form.unitId" placeholder="请选择" style="width:100%">
+            <el-form-item label="单位" prop="">
+              <el-select
+                v-model="form.unitId"
+                placeholder="请选择"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in unitId"
                   :key="item.id"
@@ -178,17 +190,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="参考范围类别" prop="referenceRangeTypeFlag">
+            <el-form-item label="参考范围类型" prop="referenceRangeTypeFlag">
               <el-select
                 v-model="form.referenceRangeTypeFlag"
                 placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
-                  v-for="item in reference"
-                  :key="item.id"
-                  :label="item.ageUpperLimit"
-                  :value="item.id"
+                  v-for="item in referenceRangeTypeFlag"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
                 </el-option>
               </el-select>
@@ -202,7 +214,11 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="名称进入小结" prop="isNameIntoSummary">
-              <el-select v-model="form.isNameIntoSummary" placeholder="请选择" style="width:100%">
+              <el-select
+                v-model="form.isNameIntoSummary"
+                placeholder="请选择"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in isNameIntoSummary"
                   :key="item.value"
@@ -216,9 +232,10 @@
           <el-col :span="8">
             <el-form-item label="启用诊断函数" prop="isDiagnosisFunction">
               <el-select
+                @change="enablediagnostics"
                 v-model="form.isDiagnosisFunction"
                 placeholder="请选择"
-                style="width:100%"
+                style="width: 100%"
               >
                 <el-option
                   v-for="item in isDiagnosisFunction"
@@ -232,12 +249,19 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="诊断函数" prop="diagnosisFunction">
-              <el-input v-model="form.diagnosisFunction"></el-input>
+              <el-input
+                v-model="form.diagnosisFunction"
+                :disabled="disableddiagnosisFunction"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="是计算项目" prop="isCalculationItem">
-              <el-select v-model="form.isCalculationItem" placeholder="请选择" style="width:100%">
+              <el-select
+                v-model="form.isCalculationItem"
+                placeholder="请选择"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in isCalculationItem"
                   :key="item.value"
@@ -255,7 +279,11 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="继续处理" prop="isContinueProcess">
-              <el-select v-model="form.isContinueProcess" placeholder="请选择" style="width:100%">
+              <el-select
+                v-model="form.isContinueProcess"
+                placeholder="请选择"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in isContinueProcess"
                   :key="item.value"
@@ -267,13 +295,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="结果模板" prop="resultTemplateTypeFlag" >
+            <el-form-item label="结果模板" prop="resultTemplateTypeFlag">
               <!-- <el-input v-model="form.resultTemplateTypeFlag">resulttemp</el-input> -->
-              <el-select v-model="form.resultTemplateTypeFlag" placeholder="请选择" style="width:100%">
+              <el-select
+                v-model="form.resultTemplateTypeFlag"
+                placeholder="请选择"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in resulttemp"
                   :key="item.id"
-                  :label="item.results"
+                  :label="item.result"
                   :value="item.id"
                 >
                 </el-option>
@@ -287,7 +319,11 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="启用" prop="isActive">
-              <el-select v-model="form.isActive" placeholder="请选择" style="width:100%">
+              <el-select
+                v-model="form.isActive"
+                placeholder="请选择"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in isActive"
                   :key="item.value"
@@ -963,6 +999,24 @@ export default {
         inputCheck: "",
         isActive: "",
       },
+      referenceRangeTypeFlag: [
+        {
+          value: "0",
+          label: "无参考范围",
+        },
+        {
+          value: "1",
+          label: "数字型参考范围",
+        },
+        {
+          value: "2",
+          label: "字符型参考范围",
+        },
+        {
+          value: "3",
+          label: "性激素参考范围",
+        },
+      ],
       isProduceSummary: [
         {
           value: "Y",
@@ -1135,6 +1189,7 @@ export default {
       scopediagnostic: [], //诊断范围下拉框
       reference: [], //参考范围
       resulttemp: [], // 结果模板
+      disableddiagnosisFunction: false,
     };
   },
   created() {
@@ -1146,6 +1201,16 @@ export default {
     this.typeid();
   },
   methods: {
+    //启用诊断函数
+    enablediagnostics(v) {
+      console.log(v);
+      if (v == 'N') {
+        this.disableddiagnosisFunction = true;
+      }else{
+         this.disableddiagnosisFunction = false;
+      }
+        
+    },
     //参考范围确定类型
     determinetype() {
       if (this.referencerangevalue == 2) {

src/views/fee-settings/MedicalPackage.vue

@@ -438,7 +438,7 @@ export default {
       if (this.rightdata.length > 0) {
         this.rightdata.splice(this.nums, 1);
         this.leftdata.push(this.leftobj);
-        this.isdislob = true;
+        this.isdislob = false;
 
         this.updatedate();
       }