Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/data.js

@@ -263,6 +263,50 @@ export function GetAddition(params) {
 
 
 
+export function createDiagnose(params) {
+  return request({
+    url: '/api/diagnose/create',
+    method: 'post',
+    params: params
+  })
+}
+
+export function modifyDiagnose(params) {
+  return request({
+    url: '/api/diagnose/modify',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getDiagnoseList(params) {
+  return request({
+    url: '/api/diagnose/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteDiagnose(params) {
+  return request({
+    url: '/api/diagnose/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function GetDiagnose(params) {
+  return request({
+    url: '/api/diagnose/get',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+
+
 
 
 

src/xt_pages/data/components/addtion.vue

@@ -190,6 +190,7 @@
               response.data.data.addition.code
             this.Dialog.formValue.price =
               response.data.data.addition.price
+            this.Dialog.titles="编辑"
 
             this.Dialog.isCreated = 2
             this.$refs.dialog.show()
@@ -286,6 +287,7 @@
         this.$refs.dialog.hide()
       },
       showDialog: function() {
+        this.Dialog.titles="新增"
         this.Dialog.formValue = Object.assign(
           {},
           this.Dialog.resetForm

src/xt_pages/data/components/diagnoseOther.vue

@@ -0,0 +1,382 @@
+<template>
+  <div class="main-contain">
+    <div class=" sign-and-weigh-box" style="background: white">
+
+
+      <diagnose-other-dialog
+        ref="dialog"
+        :titles="Dialog.titles"
+        :formValue="Dialog.formValue"
+        :visibility="Dialog.isVisibility"
+        :type="Dialog.type"
+        :isCreated="Dialog.isCreated"
+        v-on:dialog-comfirm="dialogComfirm"
+        v-on:dialog-cancle="dialogCancle"
+      ></diagnose-other-dialog>
+
+
+      <el-row :gutter="15">
+        <el-col>
+          <div>
+            <el-button
+              size="small"
+              icon="el-icon-circle-plus-outline"
+              style="float: right;margin-bottom: 15px"
+              type="primary"
+              @click="showDialog"
+            >新增
+            </el-button>
+          </div>
+
+          <el-table
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            :data="manufacturerData"
+            style="width: 100%"
+            border
+            v-loading="loading"
+          >
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.country_code }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="目录代码" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.content_code }}
+              </template>
+            </el-table-column>
+
+
+            <el-table-column label="诊断名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.class_name }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="国家目录名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.country_content_name }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.remark }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="编辑"
+                  placement="top"
+                >
+                  <el-button
+                    size="small"
+                    type="primary"
+                    icon="el-icon-edit-outline"
+                    @click="handleEdit(scope.$index, scope.row)"
+                  >
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="删除"
+                  placement="top"
+                >
+                  <el-button
+                    size="small"
+                    type="danger"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.$index, scope.row)"
+                  >
+                  </el-button>
+                </el-tooltip>
+
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    createDiagnose,
+    modifyDiagnose,
+    getDiagnoseList,
+    deleteDiagnose,
+    GetDiagnose
+  } from '@/api/data'
+  import DiagnoseOtherDialog from "./diagnoseOtherDialog";
+
+  export default {
+    components: {
+      DiagnoseOtherDialog,
+    },
+    name: 'diagnoseOther',
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        manufacturerData: [],
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+
+        page: 1,
+        limit: 10,
+        loading: false,
+
+        manufacturer_code: '',
+        editId: '',
+        editIndex: '',
+        Dialog: {
+          titles: '新增',
+          isVisibility: false,
+          isCreated: 1, //1.创建 2.编辑 3.查看详情
+          formValue: {
+            class_name: '',
+            content_code: '',
+            country_code: '',
+            country_content_name: '',
+            remark: '',
+            pinyin: '',
+            wubi: ''
+
+          },
+          resetForm: {
+            class_name: '',
+            content_code: '',
+            country_code: '',
+            country_content_name: '',
+            remark: '',
+            pinyin: '',
+            wubi: ''
+          }
+        }
+      }
+    },
+    methods: {
+      handleEdit: function(index, row) {
+        this.editId = row.id
+        this.editIndex = index
+        let params = {
+          id: row.id
+        }
+        GetDiagnose(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Dialog.formValue.class_name =
+              response.data.data.sick.class_name
+            this.Dialog.formValue.content_code =
+              response.data.data.sick.content_code
+            this.Dialog.formValue.country_code =
+              response.data.data.sick.country_code
+            this.Dialog.formValue.country_content_name =
+              response.data.data.sick.country_content_name
+            this.Dialog.formValue.remark =
+              response.data.data.sick.remark
+            this.Dialog.formValue.pinyin =
+              response.data.data.sick.pinyin
+            this.Dialog.formValue.wubi =
+              response.data.data.sick.wubi
+
+            this.Dialog.isCreated = 2
+            this.$refs.dialog.show()
+
+          }
+        })
+      },
+      handleDelete: function(index, row) {
+        this.$confirm('确认删除这条记录?', '删除记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let params = {
+              id: row.id
+            }
+            deleteDiagnose(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.manufacturerData.splice(index, 1)
+                this.$message.success('厂家已经删除')
+              }
+            })
+          })
+          .catch(() => {
+          })
+      },
+      showDetails: function(index, row) {
+        let params = {
+          id: row.id
+        }
+        GetDiagnose(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Dialog.formValue.class_name =
+              response.data.data.sick.class_name
+            this.Dialog.formValue.content_code =
+              response.data.data.sick.content_code
+            this.Dialog.formValue.country_code =
+              response.data.data.sick.country_code
+            this.Dialog.formValue.country_content_name =
+              response.data.data.sick.country_content_name
+            this.Dialog.formValue.remark =
+              response.data.data.sick.remark
+            this.Dialog.formValue.pinyin =
+              response.data.data.sick.pinyin
+            this.Dialog.formValue.wubi =
+              response.data.data.sick.wubi
+
+            this.Dialog.isCreated = 3
+            this.Dialog.isVisibility = true
+          }
+        })
+      },
+      dialogComfirm: function(val) {
+        // this.manufacturerDialog.isVisibility = false
+        this.$refs.dialog.hide()
+        if (val.isCreated == 2) {
+          //修改
+          let params = {
+            class_name: val.class_name,
+            content_code: val.content_code,
+            country_code: val.country_code,
+            country_content_name: val.country_content_name,
+            remark: val.remark,
+            id: this.editId,
+            pinyin: val.pinyin,
+            wubi: val.wubi
+
+          }
+          modifyDiagnose(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.manufacturerData[this.editIndex].class_name =
+                response.data.data.sick.class_name
+              this.manufacturerData[this.editIndex].content_code =
+                response.data.data.sick.content_code
+              this.manufacturerData[this.editIndex].country_code =
+                response.data.data.sick.country_code
+              this.manufacturerData[this.editIndex].country_code =
+                response.data.data.sick.country_code
+              this.manufacturerData[this.editIndex].country_content_name =
+                response.data.data.sick.country_content_name
+              this.manufacturerData[this.editIndex].remark =
+                response.data.data.sick.remark
+              this.manufacturerData[this.editIndex].pinyin =
+                response.data.data.sick.pinyin
+              this.manufacturerData[this.editIndex].wubi =
+                response.data.data.sick.wubi
+
+              this.$message.success('修改成功')
+            }
+          })
+        } else if (val.isCreated == 1) {
+          //新增
+          createDiagnose(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.manufacturerData.unshift(response.data.data.sick)
+
+              this.$message.success('新增成功')
+            }
+          })
+        }
+      },
+      dialogCancle: function() {
+        this.$refs.dialog.hide()
+      },
+      showDialog: function() {
+        this.Dialog.formValue = Object.assign(
+          {},
+          this.Dialog.resetForm
+        )
+        this.$refs.dialog.show()
+        this.Dialog.isCreated = 1
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getList()
+      },
+      getList() {
+        let params = {
+          page: this.page,
+          limit: this.limit
+        }
+        this.loading = true
+        getDiagnoseList(params).then(response => {
+          if (response.data.state == 0) {
+            this.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.loading = false
+            this.total = response.data.data.total
+            this.manufacturerData = []
+            for (let i = 0; i < response.data.data.sick.length; i++) {
+              this.manufacturerData.push(response.data.data.sick[i])
+            }
+          }
+        })
+      }
+    },
+    created() {
+      this.getList()
+    }
+  }
+</script>
+
+<style lang="scss">
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
+</style>

src/xt_pages/data/components/diagnoseOtherDialog.vue

@@ -0,0 +1,161 @@
+<template>
+  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <el-form :model="formValue" :rules="rules" ref="formValue" class="demo-form-inline"
+             :label-position="labelPosition"
+             label-width="100px">
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="诊断名称" prop="class_name">
+            <el-input v-model="formValue.class_name"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="拼音" prop="pinyin">
+            <el-input v-model="formValue.pinyin"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="五笔" prop="wubi">
+            <el-input v-model="formValue.wubi"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="目录代码" prop="content_code">
+            <el-input v-model="formValue.content_code"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="国家编码" prop="country_code">
+            <el-input v-model="formValue.country_code"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="国家目录名称" prop="country_content_name">
+            <el-input v-model="formValue.country_content_name"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-col>
+        <el-form-item label="备注">
+          <el-input type="textarea" :row="5" v-model="formValue.remark"
+                    placeholder="请输入内容">
+          </el-input>
+        </el-form-item>
+      </el-col>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+    <el-button v-if="isCreated == 3" @click="cancle('formValue')">取 消</el-button>
+    <el-button v-if="isCreated != 3 " @click="cancle('formValue')">取 消</el-button>
+    <el-button v-if="isCreated != 3" type="primary" @click="comfirm('formValue')">保 存</el-button>
+  </span>
+  </el-dialog>
+
+</template>
+
+<script>
+  export default {
+    name: 'diagnoseOtherDialog',
+
+    data() {
+
+      return {
+        visibility: false,
+        labelPosition: 'right',
+        isClose: false,
+        form: {
+          class_name: '',
+          content_code: '',
+          country_code: '',
+          country_content_name: '',
+          remark: '',
+          pinyin: '',
+          wubi: ''
+
+        },
+        resetForm: {
+          class_name: '',
+          content_code: '',
+          country_code: '',
+          country_content_name: '',
+          remark: '',
+          pinyin: '',
+          wubi: ''
+        },
+        rules: {
+          class_name: [
+            { required: true, message: '请输入大类名称', trigger: 'blur' }
+          ],
+          content_code: [
+            { required: true, message: '请输入目录代码', trigger: 'blur' }
+          ]
+
+        }
+      }
+    },
+    props: {
+
+      titles: {
+        type: String,
+        default: ''
+      },
+      formValue: {
+        type: Object
+      },
+      type: {
+        type: Number,
+        default: 1
+
+      },
+      isCreated: {
+        type: Number,
+        default: 1
+
+      }
+    },
+    methods: {
+      show: function() {
+        this.visibility = true
+
+      }, hide: function() {
+        this.visibility = false
+      },
+      cancle: function(formName) {
+        this.$emit('dialog-cancle', this.getValue())
+        this.$refs['formValue'].resetFields()
+      },
+      comfirm: function(formName) {
+        this.$refs['formValue'].validate((valid) => {
+          if (valid) {
+            let value = {}
+            value = this.getValue()
+            this.$emit('dialog-comfirm', value)
+            this.form = Object.assign({}, this.resetForm)
+
+          }
+        })
+      },
+      getValue: function() {
+        let form = {}
+        form = this.formValue
+        form['title'] = this.titles
+        form['type'] = this.type
+        form['isCreated'] = this.isCreated
+        return form
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/data/specialDictionary.vue

@@ -42,7 +42,8 @@
         </el-tab-pane>
 
         <el-tab-pane label="诊断信息" name="10">
-          <diagnosis></diagnosis>
+          <!--<diagnosis></diagnosis>-->
+          <diagnose-other></diagnose-other>
         </el-tab-pane>
 
       </el-tabs>
@@ -62,10 +63,14 @@
   import Dealer from '../stock/config/dealer'
   import Diagnosis from './components/diagnosis'
   import Addtion from './components/addtion'
+  import DiagnoseOtherDialog from "./components/diagnoseOtherDialog";
+  import DiagnoseOther from "./components/diagnoseOther";
 
   export default {
     name: 'specialDictionary',
     components: {
+      DiagnoseOther,
+      DiagnoseOtherDialog,
       Addtion,
       Diagnosis,
       Dealer,

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -5,18 +5,21 @@
     </div>
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
-        <!-- <div class="mainCell" style="justify-content: space-between;">
-          <p style="color: red">未收费：<span>{{cal_one}}</span>人</p>
-          <p style="color: red">已收费：<span>{{cal_two}}</span>人</p>
-          <p style="color: red">已退费：<span>{{cal_three}}</span>人</p>
-
-        </div> -->
+         <div class="mainCell" style="justify-content: space-between;">
+          <p >未收费：<span style="color: red">{{cal_one}}</span>人</p>
+          <p>已收费：<span  style="color: red">{{cal_two}}</span>人</p>
+          <p>已退费：<span  style="color: red">{{cal_three}}</span>人</p>
+        </div>
         <div class="mainCell">
           <el-radio-group v-model="radio" @change="changeRadio">
-            <el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>
-            <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>
-            <el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>
+            <el-radio :label=1>未收费</el-radio>
+            <el-radio :label=2>已收费</el-radio>
+            <el-radio :label=3>已退费</el-radio>
             <el-radio :label=4>全部</el-radio>
+            <!--<el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>-->
+            <!--<el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>-->
+            <!--<el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>-->
+            <!--<el-radio :label=4>全部</el-radio>-->
 
           </el-radio-group>
         </div>

src/xt_pages/outpatientCharges/summary.vue

@@ -51,7 +51,7 @@
           type="index"
         >
         </el-table-column>
-        <el-table-column align="center" prop="name" label="门诊号">
+        <el-table-column align="center" prop="name" label="就诊号">
           <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="患者名字">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -21,17 +21,17 @@
           <!--<el-form-item label="挂号类型: " prop="name">-->
           <!--<el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>-->
           <!--</el-form-item>-->
-          <el-form-item label="挂号类型: " prop="name" label-position="right">
+          <el-form-item label="处方类型: " prop="name" label-position="right">
             <el-select style="width:100%;" v-model="register_type" placeholder="">
               <el-option
-                v-for="(item,index) in getDictionaryDataConfig('system','register_type')"
+                v-for="(item,index) in register"
                 :key="index"
-                :label="item.name"
-                :value="item.name">
+                :label="item.label"
+                :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="疾病类型:" prop="name" label-position="right">
+          <el-form-item label="大病类型:" prop="name" label-position="right">
 
             <el-select style="width:100%;" v-model="state1" placeholder="">
               <el-option
@@ -43,6 +43,22 @@
             </el-select>
 
           </el-form-item>
+
+          <el-form-item label="诊断:" prop="name" label-position="right">
+
+            <el-select style="width:100%;" v-model="diagnose" placeholder="">
+              <el-option
+                v-for="(item,index) in diagnoses"
+                :key="index"
+                :label="item.class_name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+
+
           <el-form-item label="过敏病史: " prop="name" label-position="right">
             <el-autocomplete
               style="width:100%;"
@@ -79,7 +95,7 @@
         </div>
         <div class="costBox">
           <div>
-            <span>医生：</span>
+            <span><span style="color: red">*</span>医生：</span>
             <el-select style="margin-right:5px;width:140px;" v-model="doctorValue" placeholder="" @change="changeDoctor">
               <el-option
                 v-for="(item,index) in doctors"
@@ -88,7 +104,7 @@
                 :value="item.admin_user_id">
               </el-option>
             </el-select>
-            <span>科室：</span>
+            <span> <span style="color: red">*</span>科室：</span>
             <el-select style="margin-right:5px;width:140px;" v-model="departmentValue" placeholder="">
               <el-option
                 v-for="(item,index) in department"
@@ -304,10 +320,6 @@
         type: Array,
         default: []
       },
-      diagnoses: {
-        type: Array,
-        default: []
-      }
     },
     components: {
       selectTemplate,
@@ -317,6 +329,16 @@
     },
     data() {
       return {
+        register: [
+          {value: 0,label:"普通"},
+          {value: 1,label: '急诊'},
+          {value: 2,label: "儿科"},
+          {value: 3,label: "麻醉"},
+          {value: 4,label: "精一"},
+          {value: 5,label: "精二"},
+          {value: 6,label: "其他"},
+
+        ],
         multipleTableHeight:'',
         register_type: '',
         value: '0',
@@ -367,6 +389,8 @@
         ],
         department: [],
         sick: [],
+        diagnoses: [],
+        diagnose:'',
         curTotal: 0,
         prescription_id: 0
       }
@@ -511,16 +535,7 @@
         }
       },
 
-      querySearch(queryString, cb) {
-        var restaurants = this.diagnoses
-        console.log(restaurants)
-        restaurants.map(item => {
-          item.value = item.name
-        })
-        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
-        // 调用 callback 返回建议列表的数据
-        cb(results)
-      },
+
 
       querySearch2(queryString, cb) {
         var restaurants = this.other_sick
@@ -560,7 +575,10 @@
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
             this.sick = response.data.data.sick
-            this.additions = response.data.data.additions
+
+            this.sick = response.data.data.sick
+
+            this.diagnoses = response.data.data.diagnose
             // var info = response.data.data.info
             // if (info.user_type == 2 || info.user_type == 1) {
             //   this.doctorValue = info.admin_user_id
@@ -630,7 +648,7 @@
         this.teamList = []
 
       },
-      setData(data, info, admin_info,doctors,department) {
+      setData(data, info, admin_info,doctors,department,hisPatientInfo) {
         this.prescription_id = data[0].id
         this.editableTabsValue = "处方1"
         this.$emit('event1', this.prescription_id)
@@ -653,11 +671,17 @@
           this.showOne = false
           this.showTwo = true
         }
-        this.state1 = info.diagnosis
-        this.state2 = info.sick_history
+        this.state1 = info.sick_type
+        if(this.state1 == 0){
 
+          this.state1 = ""
+        }
+        this.state2 = info.sick_history
+        if(this.state2 == 0){
+          this.state2 = ""
+        }
 
-        this.register_type = info.register_type
+        // this.register_type = info.register_type
 
         if(info.prescription_status == 0){
           this.order_status = ''
@@ -678,42 +702,41 @@
 
 
         if(info.id > 0){
-          console.log("!Q!!!!")
-
           this.doctorValue = info.doctor_id
           this.departmentValue = info.department
         }else{
-          console.log("------")
-          this.doctorValue = ''
-          this.departmentValue = ''
-
-          if (admin_info.user_type == 2 || admin_info.user_type == 1) {
-            this.doctorValue = admin_info.admin_user_id
-            if (admin_info.department_id == 0) {
-              if (this.department.length > 0) {
-                this.departmentValue = department[0].id
+          if(hisPatientInfo.doctor != 0 && hisPatientInfo.department != 0) {
+            this.doctorValue = hisPatientInfo.doctor
+            this.departmentValue = hisPatientInfo.department
+          }else{
+            if (admin_info.user_type == 2 || admin_info.user_type == 1) {
+              this.doctorValue = admin_info.admin_user_id
+              if (admin_info.department_id == 0) {
+                if (this.department.length > 0) {
+                  this.departmentValue = department[0].id
+                } else {
+                  this.departmentValue = ''
+                }
               } else {
-                this.departmentValue = ''
+                this.departmentValue = admin_info.department_id
               }
             } else {
-              this.departmentValue = admin_info.department_id
+              this.doctorValue = doctors[0].admin_user_id
+            }
+            if(this.doctorValue == 0){
+              this.doctorValue = ''
             }
-          }else{
-            this.doctorValue = doctors[0].admin_user_id
-          }
-
-          if(this.doctorValue == 0){
-            this.doctorValue = ''
           }
-
-
-
         }
-
-
-
-
-
+        if (info.register_type == 0){
+          // if(hisPatientInfo.register_type != 0){
+          //   this.register_type = hisPatientInfo.register_type
+          // }else{
+            this.register_type = ''
+          // }
+        }else{
+          this.register_type = info.register_type
+        }
       },
       moreState(tab, event) {
         if (tab == 'more') {
@@ -738,7 +761,8 @@
         if (index == 1) {
           let params = {
             patient_id: this.patientInfo.id,
-            diagnose: this.state1,
+            diagnose: this.diagnose,
+            sick_type: this.state1,
             sick_history: this.state2,
             doctor: this.doctorValue,
             department: this.departmentValue,

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -420,7 +420,7 @@
 
 
 
-            this.$refs.prescriptions.setData(this.prescriptions,this.info,this.admin_info,this.doctors,this.department)
+            this.$refs.prescriptions.setData(this.prescriptions,this.info,this.admin_info,this.doctors,this.department,this.hisPatientInfo)
           }
         })
 
@@ -436,149 +436,302 @@
           }
         }
         if(isShowDailog){
-
           this.patientTableData.map((item,index) => {
             if(item.patient_id == this.oldCurrentRow.patient_id){
               this.$refs.tab.setCurrentRow(this.patientTableData[index])
+              return
             }
           })
-          this.$message.error('需要保存当前处方才能切换')
-          return
-        }
-
-
-        this.patientid = val.patients.id
-        let params = {
-          'record_date': this.record_date,
-          'patient_id': val.patients.id
-        }
-        getPatientInfo(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.prescriptions = []
-            this.patientInfo = response.data.data.xt_info
-            this.hisPatientInfo = response.data.data.his_info
-            this.case_history = response.data.data.case_history
-            var case_history = response.data.data.case_history
-            console.log("case_history22222222",case_history)
-            if (case_history.breathing  == 0) {
-                case_history.breathing = ""
-            }
-            this.case_history = case_history
-            this.info = response.data.data.info
-            this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
-            if (this.case_history.temperature <= 0) {
-              this.case_history.temperature = ''
-            }
-            if (this.case_history.blood_sugar <= 0) {
-              this.case_history.blood_sugar = ''
-            }
-            if (this.case_history.pulse <= 0) {
-              this.case_history.pulse = ''
-            }
-            if (this.case_history.sbp <= 0) {
-              this.case_history.sbp = ''
-            }
-            if (this.case_history.dbp <= 0) {
-              this.case_history.dbp = ''
-            }
-            if (this.case_history.height <= 0) {
-              this.case_history.height = ''
-            }
-            if (this.case_history.blood_fat <= 0) {
-              this.case_history.blood_fat = ''
-            }
-            if (this.case_history.sick_type <= 0) {
-              this.case_history.sick_type = ''
-            }
-            this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
-            if (this.case_history.is_infect == 1) {
-              this.case_history.is_infect = true
-            } else {
-              this.case_history.is_infect = false
+          this.$confirm('是否保存当前处方', '保存', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            this.open(1)
+          }).catch(() => {
+            this.patientTableData.map((item,index) => {
+              if(item.patient_id == val.patient_id){
+                this.$refs.tab.setCurrentRow(this.patientTableData[index])
+              }
+            })
+            this.patientid = val.patients.id
+            let params = {
+              'record_date': this.record_date,
+              'patient_id': val.patients.id
             }
-            this.prescriptionList =response.data.data.prescription
-            if (response.data.data.prescription.length > 0) {
-              for (let i = 0; i < response.data.data.prescription.length; i++) {
-                var prescription = response.data.data.prescription[i]
-                let tempAdvice = []
-                let tempProject = []
-                let tempAddition = []
-                for (let b = 0; b < prescription.advices.length; b++) {
-                  let obj = {
-                    advice_id: prescription.advices[b].id,
-                    drug_name: prescription.advices[b].advice_name,
-                    single_dose: prescription.advices[b].single_dose,
-                    delivery_way: prescription.advices[b].delivery_way,
-                    execution_frequency: prescription.advices[b].execution_frequency,
-                    retail_price: prescription.advices[b].price.toString(),
-                    remark: prescription.advices[b].remark,
-                    day:prescription.advices[b].day,
-                    prescribing_number:prescription.advices[b].prescribing_number.toString(),
-                    single_dose_unit:prescription.advices[b].single_dose_unit,
-                    prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
-                    medical_insurance_number:prescription.advices[b].med_list_codg,
-                    id:prescription.advices[b].drug_id
-                  }
-                  tempAdvice.push(obj)
+            getPatientInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.prescriptions = []
+                this.patientInfo = response.data.data.xt_info
+                this.hisPatientInfo = response.data.data.his_info
+                this.case_history = response.data.data.case_history
+                var case_history = response.data.data.case_history
+                console.log("case_history22222222",case_history)
+                if (case_history.breathing  == 0) {
+                  case_history.breathing = ""
                 }
-                for (let b = 0; b < prescription.project.length; b++) {
-                  console.log(prescription.project[b])
-                  console.log(prescription.project[b].project)
+                this.case_history = case_history
+                this.info = response.data.data.info
+                this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+                if (this.case_history.temperature <= 0) {
+                  this.case_history.temperature = ''
+                }
+                if (this.case_history.blood_sugar <= 0) {
+                  this.case_history.blood_sugar = ''
+                }
+                if (this.case_history.pulse <= 0) {
+                  this.case_history.pulse = ''
+                }
+                if (this.case_history.sbp <= 0) {
+                  this.case_history.sbp = ''
+                }
+                if (this.case_history.dbp <= 0) {
+                  this.case_history.dbp = ''
+                }
+                if (this.case_history.height <= 0) {
+                  this.case_history.height = ''
+                }
+                if (this.case_history.blood_fat <= 0) {
+                  this.case_history.blood_fat = ''
+                }
+                if (this.case_history.sick_type <= 0) {
+                  this.case_history.sick_type = ''
+                }
+                this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+                if (this.case_history.is_infect == 1) {
+                  this.case_history.is_infect = true
+                } else {
+                  this.case_history.is_infect = false
+                }
+                this.prescriptionList =response.data.data.prescription
+                if (response.data.data.prescription.length > 0) {
+                  for (let i = 0; i < response.data.data.prescription.length; i++) {
+                    var prescription = response.data.data.prescription[i]
+                    let tempAdvice = []
+                    let tempProject = []
+                    let tempAddition = []
+                    for (let b = 0; b < prescription.advices.length; b++) {
+                      let obj = {
+                        advice_id: prescription.advices[b].id,
+                        drug_name: prescription.advices[b].advice_name,
+                        single_dose: prescription.advices[b].single_dose,
+                        delivery_way: prescription.advices[b].delivery_way,
+                        execution_frequency: prescription.advices[b].execution_frequency,
+                        retail_price: prescription.advices[b].price.toString(),
+                        remark: prescription.advices[b].remark,
+                        day:prescription.advices[b].day,
+                        prescribing_number:prescription.advices[b].prescribing_number.toString(),
+                        single_dose_unit:prescription.advices[b].single_dose_unit,
+                        prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
+                        medical_insurance_number:prescription.advices[b].med_list_codg,
+                        id:prescription.advices[b].drug_id
+                      }
+                      tempAdvice.push(obj)
+                    }
+                    for (let b = 0; b < prescription.project.length; b++) {
+                      console.log(prescription.project[b])
+                      console.log(prescription.project[b].project)
+                      let obj = {
+                        id: prescription.project[b].id,
+                        project_id: prescription.project[b].project_id,
+                        project_name: prescription.project[b].project.project_name,
+                        statistical_classification: prescription.project[b].project.statistical_classification,
+                        single_dose: prescription.project[b].single_dose,
+                        delivery_way: prescription.project[b].delivery_way,
+                        execution_frequency: prescription.project[b].execution_frequency,
+                        number_days: prescription.project[b].day,
+                        total:prescription.project[b].count.toString(),
+                        price:prescription.project[b].price,
+                        remark:prescription.project[b].remark,
+                        medical_code:prescription.project[b].project.medical_code,
+                        unit:prescription.project[b].unit
+                      }
+                      tempProject.push(obj)
+                    }
+                    for (let b = 0; b < prescription.addition.length; b++) {
+                      let obj = {
+                        id: prescription.addition[b].id,
+                        item_name: prescription.addition[b].item_name,
+                        price: prescription.addition[b].price,
+                        count: prescription.addition[b].count,
+                        item_id: prescription.addition[b].item_id,
+                      }
+                      tempAddition.push(obj)
+                    }
+                    let index = i + 1
+                    let obj = {
+                      id: prescription.id,
+                      name: '处方' + index,
+                      advices: tempAdvice,
+                      project: tempProject,
+                      addition:tempAddition,
+                      order_status:prescription.order_status
+                    }
+                    this.prescriptions.push(obj)
+                  }
+                } else {
                   let obj = {
-                    id: prescription.project[b].id,
-                    project_id: prescription.project[b].project_id,
-                    project_name: prescription.project[b].project.project_name,
-                    statistical_classification: prescription.project[b].project.statistical_classification,
-                    single_dose: prescription.project[b].single_dose,
-                    delivery_way: prescription.project[b].delivery_way,
-                    execution_frequency: prescription.project[b].execution_frequency,
-                    number_days: prescription.project[b].day,
-                    total:prescription.project[b].count.toString(),
-                    price:prescription.project[b].price,
-                    remark:prescription.project[b].remark,
-                    medical_code:prescription.project[b].project.medical_code,
-                    unit:prescription.project[b].unit
+                    id:0,
+                    name: '处方' + 1,
+                    advices: [],
+                    project: [],
+                    addition:[],
+                    orderStatus:0,
                   }
-                  tempProject.push(obj)
+                  this.prescriptions.push(obj)
                 }
-                for (let b = 0; b < prescription.addition.length; b++) {
+                this.$refs.prescriptions.setData(this.prescriptions,this.info)
+              }
+            })
+
+
+          })
+
+
+
+          // this.$message.error('需要保存保存处方才能切换')
+        }else{
+          this.patientid = val.patients.id
+          let params = {
+            'record_date': this.record_date,
+            'patient_id': val.patients.id
+          }
+          getPatientInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.prescriptions = []
+              this.patientInfo = response.data.data.xt_info
+              this.hisPatientInfo = response.data.data.his_info
+              this.case_history = response.data.data.case_history
+              var case_history = response.data.data.case_history
+              console.log("case_history22222222",case_history)
+              if (case_history.breathing  == 0) {
+                case_history.breathing = ""
+              }
+              this.case_history = case_history
+              this.info = response.data.data.info
+              this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+              if (this.case_history.temperature <= 0) {
+                this.case_history.temperature = ''
+              }
+              if (this.case_history.blood_sugar <= 0) {
+                this.case_history.blood_sugar = ''
+              }
+              if (this.case_history.pulse <= 0) {
+                this.case_history.pulse = ''
+              }
+              if (this.case_history.sbp <= 0) {
+                this.case_history.sbp = ''
+              }
+              if (this.case_history.dbp <= 0) {
+                this.case_history.dbp = ''
+              }
+              if (this.case_history.height <= 0) {
+                this.case_history.height = ''
+              }
+              if (this.case_history.blood_fat <= 0) {
+                this.case_history.blood_fat = ''
+              }
+              if (this.case_history.sick_type <= 0) {
+                this.case_history.sick_type = ''
+              }
+              this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+              if (this.case_history.is_infect == 1) {
+                this.case_history.is_infect = true
+              } else {
+                this.case_history.is_infect = false
+              }
+              this.prescriptionList =response.data.data.prescription
+              if (response.data.data.prescription.length > 0) {
+                for (let i = 0; i < response.data.data.prescription.length; i++) {
+                  var prescription = response.data.data.prescription[i]
+                  let tempAdvice = []
+                  let tempProject = []
+                  let tempAddition = []
+                  for (let b = 0; b < prescription.advices.length; b++) {
+                    let obj = {
+                      advice_id: prescription.advices[b].id,
+                      drug_name: prescription.advices[b].advice_name,
+                      single_dose: prescription.advices[b].single_dose,
+                      delivery_way: prescription.advices[b].delivery_way,
+                      execution_frequency: prescription.advices[b].execution_frequency,
+                      retail_price: prescription.advices[b].price.toString(),
+                      remark: prescription.advices[b].remark,
+                      day:prescription.advices[b].day,
+                      prescribing_number:prescription.advices[b].prescribing_number.toString(),
+                      single_dose_unit:prescription.advices[b].single_dose_unit,
+                      prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
+                      medical_insurance_number:prescription.advices[b].med_list_codg,
+                      id:prescription.advices[b].drug_id
+                    }
+                    tempAdvice.push(obj)
+                  }
+                  for (let b = 0; b < prescription.project.length; b++) {
+                    console.log(prescription.project[b])
+                    console.log(prescription.project[b].project)
+                    let obj = {
+                      id: prescription.project[b].id,
+                      project_id: prescription.project[b].project_id,
+                      project_name: prescription.project[b].project.project_name,
+                      statistical_classification: prescription.project[b].project.statistical_classification,
+                      single_dose: prescription.project[b].single_dose,
+                      delivery_way: prescription.project[b].delivery_way,
+                      execution_frequency: prescription.project[b].execution_frequency,
+                      number_days: prescription.project[b].day,
+                      total:prescription.project[b].count.toString(),
+                      price:prescription.project[b].price,
+                      remark:prescription.project[b].remark,
+                      medical_code:prescription.project[b].project.medical_code,
+                      unit:prescription.project[b].unit
+                    }
+                    tempProject.push(obj)
+                  }
+                  for (let b = 0; b < prescription.addition.length; b++) {
+                    let obj = {
+                      id: prescription.addition[b].id,
+                      item_name: prescription.addition[b].item_name,
+                      price: prescription.addition[b].price,
+                      count: prescription.addition[b].count,
+                      item_id: prescription.addition[b].item_id,
+                    }
+                    tempAddition.push(obj)
+                  }
+                  let index = i + 1
                   let obj = {
-                    id: prescription.addition[b].id,
-                    item_name: prescription.addition[b].item_name,
-                    price: prescription.addition[b].price,
-                    count: prescription.addition[b].count,
-                    item_id: prescription.addition[b].item_id,
+                    id: prescription.id,
+                    name: '处方' + index,
+                    advices: tempAdvice,
+                    project: tempProject,
+                    addition:tempAddition,
+                    order_status:prescription.order_status
                   }
-                  tempAddition.push(obj)
+                  this.prescriptions.push(obj)
                 }
-                let index = i + 1
+              } else {
                 let obj = {
-                  id: prescription.id,
-                  name: '处方' + index,
-                  advices: tempAdvice,
-                  project: tempProject,
-                  addition:tempAddition,
-                  order_status:prescription.order_status
+                  id:0,
+                  name: '处方' + 1,
+                  advices: [],
+                  project: [],
+                  addition:[],
+                  orderStatus:0,
                 }
                 this.prescriptions.push(obj)
               }
-            } else {
-              let obj = {
-                id:0,
-                name: '处方' + 1,
-                advices: [],
-                project: [],
-                addition:[],
-                orderStatus:0,
-              }
-              this.prescriptions.push(obj)
+              this.$refs.prescriptions.setData(this.prescriptions,this.info)
             }
-            this.$refs.prescriptions.setData(this.prescriptions,this.info)
-          }
-        })
+          })
+
+
+        }
+
+
+
       },
       currentChange(currentRow, oldCurrentRow){
         let isShowDailog = false