From c293c6a06d05340966b883b104fecdeb59528f7b Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Mon, 10 Apr 2023 18:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=82=A3=E8=80=85=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../optometryManagement/dioptric/HIS-add.vue  | 14 +++----
 .../optometryManagement/dioptric/index.vue    |  2 +
 .../dioptric/patient-add-or-update.vue        | 41 +++++++++++--------
 .../outpatientManagement/call/HIS-add.vue     | 14 +++----
 .../outpatientManagement/call/index.vue       |  2 +
 .../call/patient-add-or-update.vue            | 24 +++++------
 .../outpatientManagement/treat/HIS-add.vue    | 16 ++++----
 .../outpatientManagement/treat/index.vue      |  5 ++-
 .../treat/patient-add-or-update.vue           | 24 +++++------
 9 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
index dafdacb..a61d93c 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
@@ -6,18 +6,16 @@
     title="HIS查询"
   >
     <el-form ref="dataFormHis" :inline="true" :model="dataFormHis" class="demo-form-inline" :rules="dataRule" @keyup.enter.native="findHandle(2)">
-      <el-col :span="4">
-        <el-form-item prop="patientId">
-          <el-input v-model="dataFormHis.patientId" placeholder="请输入病历号" clearable @clear="findHandle(1)" />
-        </el-form-item>
-      </el-col>
+      <el-form-item prop="patientId">
+        <el-input v-model="dataFormHis.patientId" placeholder="请输入病历号" clearable @clear="findHandle(1)" />
+      </el-form-item>
       <el-form-item prop="patientName">
         <el-input v-model="dataFormHis.patientName" placeholder="请输入姓名" clearable @clear="findHandle(1)" />
       </el-form-item>
       <el-form-item prop="patientIdNumber">
         <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable @clear="findHandle(1)" />
       </el-form-item>
-      <el-col :span="4">
+      <el-col :span="6">
         <el-form-item>
           <el-button type="primary" @click="findHandle(2)">查询</el-button>
           <el-button @click="visible = !visible">取消</el-button>
@@ -33,7 +31,7 @@
       <el-table-column property="patientIdNumber" label="身份证号" />
       <el-table-column property="patientPhone" label="联系电话" />
       <el-table-column property="zlProject" label="医疗项目" width="240" />
-      <el-table-column property="remark" label="备注" width="240" />
+      <el-table-column property="remark" label="备注" width="140" />
       <!--      <el-table-column property="patientAddress" label="家庭地址" />-->
       <el-table-column label="操作" width="80">
         <template slot-scope="scope">
@@ -63,7 +61,7 @@ export default {
         patientId: '',
         patientName: '',
         patientIdNumber: '',
-        outpatientDoc: '',
+        mzDoctorId: '',
         region: ''
       },
       dataForm: {},
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
index 01136d5..fcc9579 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
@@ -76,6 +76,8 @@
           </el-table-column>
           <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" />
           <el-table-column prop="sgDoctorName" label="视光医师" header-align="center" align="center" />
+          <el-table-column prop="zlPorject" label="医疗项目" header-align="center" align="center" />
+          <el-table-column prop="remark" label="备注" header-align="center" align="center" />
           <el-table-column prop="createDate" label="就诊时间" header-align="center" align="center" />
           <!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
           <!--          <el-table-column prop="callStatus" label="叫号状态" header-align="center" align="center">-->
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue
index 4dfbe17..b258531 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue
@@ -38,14 +38,14 @@
       <el-form-item label="家庭地址:" label-width="120px" prop="patientAddress">
         <el-input v-model="dataForm.patientAddress" placeholder="请输入地址" />
       </el-form-item>
-      <el-form-item label="门诊医师:" prop="outpatientDoc" label-width="120px">
-        <el-select v-model="dataForm.outpatientDoc" placeholder="请选择门诊医师">
+      <el-form-item label="门诊医师:" prop="mzDoctorId" label-width="120px">
+        <el-select v-model="dataForm.mzDoctorId" placeholder="请选择门诊医师">
           <el-option label="区域一" value="shanghai" />
           <el-option label="区域二" value="beijing" />
         </el-select>
       </el-form-item>
-      <el-form-item label="视光医师" prop="optometryDoc" label-width="120px">
-        <el-select v-model="dataForm.optometryDoc" placeholder="请选择视光医师">
+      <el-form-item label="视光医师" prop="sgDoctorId" label-width="120px">
+        <el-select v-model="dataForm.sgDoctorId" placeholder="请选择视光医师">
           <el-option label="区域一" value="shanghai" />
           <el-option label="区域二" value="beijing" />
         </el-select>
@@ -55,15 +55,17 @@
           <el-option v-for="item in zlEyeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-select v-model="dataForm.zlProject" placeholder="请选择医疗项目">
-        <el-option
-          v-for="item in projectList"
-          :key="item.itemId"
-          :label="item.itemName"
-          :value="item.itemId
-          "
-        />
-      </el-select>
+      <el-form-item label="医疗项目:" label-width="120px" prop="zlProjectCode">
+        <el-select v-model="dataForm.zlProjectCode" placeholder="请选择医疗项目">
+          <el-option
+            v-for="item in projectList"
+            :key="item.itemId"
+            :label="item.itemName"
+            :value="item.itemId
+            "
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="备注:" label-width="120px" prop="remarks">
         <el-input v-model="dataForm.remark" type="textarea" />
       </el-form-item>
@@ -97,10 +99,10 @@ export default {
         patientPhone: '',
         patientAddress: '',
         patientBirthday: '',
-        outpatientDoc: '', // 门诊医师
-        optometryDoc: '', // 视光医师
+        mzDoctorId: '', // 门诊医师
+        sgDoctorId: '', // 视光医师
         zlEye: '',
-        zlProject: '',
+        zlProjectCode: '',
         visitId: '',
         remark: ''
       },
@@ -139,6 +141,9 @@ export default {
         ],
         patientIdNumber: [
           { required: true, message: '请输入患者身份证号', trigger: 'blur' }
+        ],
+        sgDoctorId: [
+          { required: true, message: '请选择视光医师', trigger: 'blur' }
         ]
       }
     }
@@ -165,12 +170,12 @@ export default {
     getDoctorList() {
       this.$http.get('/sys/user').then(data => {
         this.doctorList = data.data.data
-        this.dataForm.optometryDoc = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+        this.dataForm.sgDoctorId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
       })
     },
     // 获取项目列表
     getProject() {
-      this.$http.post('/patient/getZlItemDict').then(data => {
+      this.$http.get('/patient/getZlItemDict').then(data => {
         this.projectList = data.data.data
       })
     },
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
index 5188c8e..6371f46 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
@@ -6,18 +6,16 @@
     title="HIS查询"
   >
     <el-form ref="dataFormHis" :inline="true" :model="dataFormHis" class="demo-form-inline" :rules="dataRule" @keyup.enter.native="findHandle(2)">
-      <el-col :span="4">
-        <el-form-item prop="patientId">
-          <el-input v-model="dataFormHis.patientId" placeholder="请输入病历号" clearable @clear="findHandle(1)" />
-        </el-form-item>
-      </el-col>
+      <el-form-item prop="patientId">
+        <el-input v-model="dataFormHis.patientId" placeholder="请输入病历号" clearable @clear="findHandle(1)" />
+      </el-form-item>
       <el-form-item prop="patientName">
         <el-input v-model="dataFormHis.patientName" placeholder="请输入姓名" clearable @clear="findHandle(1)" />
       </el-form-item>
       <el-form-item prop="patientIdNumber">
         <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable @clear="findHandle(1)" />
       </el-form-item>
-      <el-col :span="4">
+      <el-col :span="6">
         <el-form-item>
           <el-button type="primary" @click="findHandle(2)">查询</el-button>
           <el-button @click="visible = !visible">取消</el-button>
@@ -33,7 +31,7 @@
       <el-table-column property="patientIdNumber" label="身份证号" />
       <el-table-column property="patientPhone" label="联系电话" />
       <el-table-column property="zlProject" label="医疗项目" width="240" />
-      <el-table-column property="remark" label="备注" width="240" />
+      <el-table-column property="remark" label="备注" width="140" />
       <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <p class="introduce" @click="introduceHandle(scope.row)">引入</p>
@@ -63,7 +61,7 @@ export default {
         patientId: '',
         patientName: '',
         patientIdNumber: '',
-        outpatientDoc: '',
+        mzDoctorId: '',
         region: ''
       },
       dataForm: {},
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
index 3d3133c..47af0c0 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
@@ -76,6 +76,8 @@
           </el-table-column>
           <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" />
           <el-table-column prop="sgDoctorName" label="视光医师" header-align="center" align="center" />
+          <el-table-column prop="zlPorject" label="医疗项目" header-align="center" align="center" />
+          <el-table-column prop="remark" label="备注" header-align="center" align="center" />
           <el-table-column prop="createDate" label="就诊时间" header-align="center" align="center" />
           <!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
           <!--          <el-table-column prop="callStatus" label="叫号状态" header-align="center" align="center">-->
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue
index 1122a4f..5e92fe1 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue
@@ -38,8 +38,8 @@
       <el-form-item label="家庭地址:" label-width="120px" prop="patientAddress">
         <el-input v-model="dataForm.patientAddress" placeholder="请输入地址" />
       </el-form-item>
-      <el-form-item label="门诊医师:" prop="outpatientDoc" label-width="120px">
-        <el-select v-model="dataForm.outpatientDocId" placeholder="请选择门诊医师">
+      <el-form-item label="门诊医师:" prop="mzDoctorId" label-width="120px">
+        <el-select v-model="dataForm.mzDoctorId" placeholder="请选择门诊医师">
           <el-option
             v-for="item in doctorList"
             :key="item.id"
@@ -49,8 +49,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="视光医师:" prop="optometryDocId" label-width="120px">
-        <el-select v-model="dataForm.optometryDocId" placeholder="请选择视光医师">
+      <el-form-item label="视光医师:" prop="sgDoctorId" label-width="120px">
+        <el-select v-model="dataForm.sgDoctorId" placeholder="请选择视光医师">
           <el-option
             v-for="item in doctorList"
             :key="item.id"
@@ -65,8 +65,8 @@
           <el-option v-for="item in zlEyeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="医疗项目:" label-width="120px" prop="patientAddress">
-        <el-select v-model="dataForm.zlProject" placeholder="请选择医疗项目">
+      <el-form-item label="医疗项目:" label-width="120px" prop="zlProjectCode">
+        <el-select v-model="dataForm.zlProjectCode" placeholder="请选择医疗项目">
           <el-option
             v-for="item in projectList"
             :key="item.itemId"
@@ -115,9 +115,9 @@ export default {
         patientPhone: '',
         patientAddress: '',
         patientBirthday: '',
-        outpatientDocId: '', // 门诊医师
-        optometryDocId: '', // 视光医师
-        zlProject: '',
+        mzDoctorId: '', // 门诊医师
+        sgDoctorId: '', // 视光医师
+        zlProjectCode: '',
         zlEye: '',
         visitId: '',
         remark: ''
@@ -159,7 +159,7 @@ export default {
         patientIdNumber: [
           { required: true, message: '请输入患者身份证号', trigger: 'blur' }
         ],
-        optometryDocId: [
+        sgDoctorId: [
           { required: true, message: '请选择视光医师', trigger: 'blur' }
         ]
       }
@@ -187,12 +187,12 @@ export default {
     getDoctorList() {
       this.$http.get('/sys/user').then(data => {
         this.doctorList = data.data.data
-        this.dataForm.optometryDocId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+        this.dataForm.sgDoctorId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
       })
     },
     // 获取项目列表
     getProject() {
-      this.$http.post('/patient/getZlItemDict').then(data => {
+      this.$http.get('/patient/getZlItemDict').then(data => {
         this.projectList = data.data.data
       })
     },
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue
index ad58981..d7084bf 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue
@@ -6,18 +6,16 @@
     title="HIS查询"
   >
     <el-form ref="dataFormHis" :inline="true" :model="dataFormHis" class="demo-form-inline" :rules="dataRule" @keyup.enter.native="findHandle(2)">
-      <el-col :span="4">
-        <el-form-item prop="patientId">
-          <el-input v-model="dataFormHis.patientId" placeholder="请输入病历号" clearable @clear="findHandle(1)" />
-        </el-form-item>
-      </el-col>
+      <el-form-item prop="patientId">
+        <el-input v-model="dataFormHis.patientId" placeholder="请输入病历号" clearable @clear="findHandle(1)" />
+      </el-form-item>
       <el-form-item prop="patientName">
         <el-input v-model="dataFormHis.patientName" placeholder="请输入姓名" clearable @clear="findHandle(1)" />
       </el-form-item>
       <el-form-item prop="patientIdNumber">
         <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable @clear="findHandle(1)" />
       </el-form-item>
-      <el-col :span="4">
+      <el-col :span="6">
         <el-form-item>
           <el-button type="primary" @click="findHandle(2)">查询</el-button>
           <el-button @click="visible = !visible">取消</el-button>
@@ -30,10 +28,10 @@
       </template>
       <el-table-column property="patientId" label="登记号" width="100" />
       <el-table-column property="patientName" label="患者姓名" width="100" />
-      <el-table-column property="patientIdNumber" label="身份证号" />
-      <el-table-column property="patientPhone" label="联系电话" />
+      <el-table-column property="patientIdNumber" label="身份证号" width="100" />
+      <el-table-column property="patientPhone" label="联系电话" width="100" />
       <el-table-column property="zlProject" label="医疗项目" width="240" />
-      <el-table-column property="remark" label="备注" width="240" />
+      <el-table-column property="remark" label="备注" width="140" />
       <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <p class="introduce" @click="introduceHandle(scope.row)">引入</p>
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
index 988af80..40f39cd 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
@@ -70,14 +70,15 @@
               {{ scope.row.patientBirthday ? $options.filters.dateFilterTwo( scope.row.patientBirthday): '- ' }}
             </template>
           </el-table-column>
-          <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" />
-          <el-table-column prop="zlPorject" label="治疗项目" header-align="center" align="center" />
           <el-table-column prop="zlEye" label="眼别" header-align="center" align="center">
             <template slot-scope="scope">
               {{ scope.row.zlEye === 'os' ? '左眼' : ( scope.row.zlEye === 'od' ? '右眼' : '') }}
             </template>
           </el-table-column>
+          <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" />
           <el-table-column prop="patientSex" label="治疗医师" header-align="center" align="center" />
+          <el-table-column prop="zlPorject" label="医疗项目" header-align="center" align="center" />
+          <el-table-column prop="remark" label="备注" header-align="center" align="center" />
           <el-table-column prop="createDate" label="就诊时间" header-align="center" align="center" />
           <!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
           <!--          <el-table-column prop="patientSex" label="叫号状态" header-align="center" align="center">-->
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue
index 2c89feb..10df571 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue
@@ -38,8 +38,8 @@
       <el-form-item label="家庭地址:" label-width="120px" prop="patientAddress">
         <el-input v-model="dataForm.patientAddress" placeholder="请输入地址" />
       </el-form-item>
-      <el-form-item label="门诊医师:" prop="outpatientDocId" label-width="120px">
-        <el-select v-model="dataForm.outpatientDocId" placeholder="请选择门诊医师">
+      <el-form-item label="门诊医师:" prop="mzDoctorId:" label-width="120px">
+        <el-select v-model="dataForm.mzDoctorId" placeholder="请选择门诊医师">
           <el-option
             v-for="item in doctorList"
             :key="item.id"
@@ -48,8 +48,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="视光医师:" prop="optometryDocId" label-width="120px">
-        <el-select v-model="dataForm.optometryDocId" placeholder="请选择视光医师">
+      <el-form-item label="视光医师:" prop="sgDoctorId" label-width="120px">
+        <el-select v-model="dataForm.sgDoctorId" placeholder="请选择视光医师">
           <el-option
             v-for="item in doctorList"
             :key="item.id"
@@ -63,8 +63,8 @@
           <el-option v-for="item in zlEyeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="医疗项目:" label-width="120px" prop="patientAddress">
-        <el-select v-model="dataForm.zlProject" placeholder="请选择医疗项目">
+      <el-form-item label="医疗项目:" label-width="120px" prop="zlProjectCode">
+        <el-select v-model="dataForm.zlProjectCode" placeholder="请选择医疗项目">
           <el-option
             v-for="item in projectList"
             :key="item.itemId"
@@ -111,10 +111,10 @@ export default {
         patientPhone: '',
         patientAddress: '',
         patientBirthday: '',
-        outpatientDocId: '', // 门诊医师
-        optometryDocId: '', // 视光医师
+        mzDoctorId: '', // 门诊医师
+        sgDoctorId: '', // 视光医师
         zlEye: '',
-        zlProject: '',
+        zlProjectCode: '',
         visitId: '',
         remark: ''
       },
@@ -155,7 +155,7 @@ export default {
         patientIdNumber: [
           { required: true, message: '请输入患者身份证号', trigger: 'blur' }
         ],
-        optometryDocId: [
+        sgDoctorId: [
           { required: true, message: '请选择视光医师', trigger: 'blur' }
         ]
       }
@@ -182,12 +182,12 @@ export default {
     getDoctorList() {
       this.$http.get('/sys/user').then(data => {
         this.doctorList = data.data.data
-        this.dataForm.optometryDocId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+        this.dataForm.sgDoctorId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
       })
     },
     // 获取项目列表
     getProject() {
-      this.$http.post('/patient/getZlItemDict').then(data => {
+      this.$http.get('/patient/getZlItemDict').then(data => {
         this.projectList = data.data.data
       })
     },