From d13b84782bb6c0289097ca8bea8456d5dcc0353d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 28 Mar 2024 14:41:38 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/agency/index.vue | 70 ++++++++++++++++++++++++-------
 1 file changed, 55 insertions(+), 15 deletions(-)

diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue
index fa71665..de6526c 100644
--- a/src/views/system/agency/index.vue
+++ b/src/views/system/agency/index.vue
@@ -153,7 +153,12 @@
             }}</el-descriptions-item
           >
           <el-descriptions-item label="行政区划"
-            >{{ agencyList.areaName }}
+           v-if="agencyList.provinceName" >{{ agencyList.provinceName }}-{{ agencyList.cityName }}-{{
+              agencyList.regionName
+            }}-{{ agencyList.streetName }}-{{ agencyList.communityName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="行政区划"
+           v-else >
           </el-descriptions-item>
         </el-descriptions>
         <!-- <div class="information">机构信息</div>
@@ -318,7 +323,7 @@
             ></el-option>
           </el-select>
           <el-select
-            v-model="form.areaCode"
+            v-model="form.communityCode"
             clearable
             placeholder="请选择社区"
             style="width: 129px; margin-left: 10px"
@@ -829,19 +834,25 @@ export default {
 
     //点击街道
     clickstreet(item) {
+      // this.form.areaCode=item.areaCode
+      console.log(item, "jiedao");
+
       this.form.communityCode = "";
       this.form.communityName = "";
 
       getSecondaryLevelInfo(item.id).then((res) => {
-        this.streetlists = res.data;
+        if (res.data.length == 0) {
+          this.form.areaCode = item.areaCode;
+        } else {
+          this.streetlists = res.data;
+        }
       });
     },
     // 点击社区
     clickstreetlist(item) {
-      console.log(item,'555555')
+      console.log(item, "555555");
       this.form.areaCode = item.areaCode;
-      this.form.communityName = item.areaName;
-
+      // this.form.communityCode = item.areaName;
     },
     //点击区县城
     clickarea(item) {
@@ -854,7 +865,17 @@ export default {
       this.form.communityName = "";
 
       getSecondaryLevelInfo(item.id).then((res) => {
-        this.streetlist = res.data;
+        console.log(item, "qu");
+        if (res.data.length == 0) {
+          this.form.areaCode = item.areaCode;
+        } else {
+          this.streetlist = res.data;
+        }
+        // if (res.data) {
+        //   this.streetlist = res.data;
+        // } else {
+        //   this.form.areaCode = item.areaCode;
+        // }
       });
     },
     //点击市
@@ -865,9 +886,15 @@ export default {
       this.form.streetName = "";
       this.form.communityCode = "";
       this.form.communityName = "";
-
+      // console.log(this.form.cityName,'this.form.cityNames')
+      // console.log(item, "shi");
+      // this.form.areaCode=item.areaCode
       getSecondaryLevelInfo(item.id).then((res) => {
-        this.arealist = res.data;
+        if (res.data.length == 0) {
+          this.form.areaCode = item.areaCode;
+        } else {
+          this.arealist = res.data;
+        }
       });
     },
     /** 获取省列表 */
@@ -878,6 +905,10 @@ export default {
     },
     //点击省
     province(item) {
+      console.log(item, "sheng");
+
+      // this.form.areaCode=item.areaCode
+
       this.form.cityName = "";
       // this.form.streeName = "";
       // this.form.communityCode =''
@@ -888,7 +919,7 @@ export default {
       this.form.communityCode = "";
 
       this.form.regionName = "";
-      this.form.areaCode = "";
+      // this.form.areaCode = "";
       // this.form.streetCode = "";
       getSecondaryLevelInfo(item.id).then((res) => {
         this.citylist = res.data;
@@ -939,9 +970,8 @@ export default {
       }
     },
     changeagencyCategoryId(e) {
-      if(e){
+      if (e) {
         this.form.agencyCategoryId = e[e.length - 1];
-
       }
     },
     // // 节点单击事件
@@ -1008,8 +1038,13 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        cityName:null,
+        regionName:null,
+        provinceName:null,
+        streetCode:null,
         id: null,
         parentId: null,
+        communityCode: null,
         agencyCategoryId: null,
         agencyCategoryName: null,
         areaCode: null,
@@ -1067,6 +1102,7 @@ export default {
         getAgency(this.id).then((response) => {
           console.log(response.data, "response.data.parentId");
           this.form = response.data;
+          this.form.communityCode = response.data.communityName;
           this.form.parentAgencyName = response.data.parentAgencyName;
           // this.form.parentId=response.data.parentId
 
@@ -1079,9 +1115,13 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-      if (this.form.provinceCode && !this.form.communityCode) {
-        this.$message("请选择到社区");
-      }
+      // if (this.form.provinceCode && !this.form.communityCode) {
+      //   this.$message("请选择到社区");
+      // }
+      // if(this.form.cityName){
+      //   this.form.areaCode=this.form.cityName
+      // }
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {

From 813bfff9ec3d559008537f98d995bf7624fbff67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 28 Mar 2024 16:29:34 +0800
Subject: [PATCH 2/8] xg

---
 src/api/manage/visit.js            | 7 +++++++
 src/views/manage/visitin/index.vue | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/api/manage/visit.js b/src/api/manage/visit.js
index ddcd798..7fbcb6c 100644
--- a/src/api/manage/visit.js
+++ b/src/api/manage/visit.js
@@ -18,4 +18,11 @@ export function updatePatientInfo(data) {
         data: data
     })
 }
+// 查询患者信息详细
+export function getPatientInfo(id) {
+    return request({
+        url: '/manage/visitRecord/' + id,
+        method: 'get'
+    })
+}
 
diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue
index f76ac8f..612c287 100644
--- a/src/views/manage/visitin/index.vue
+++ b/src/views/manage/visitin/index.vue
@@ -383,8 +383,8 @@
 
 <script>
 import { usergetList } from "@/api/unitconfig/patientConfiguration";
-import { listPatientInfo, getPatientInfo, delPatientInfo } from "@/api/manage/patientInfo";
-import { addPatientInfo, updatePatientInfo } from "@/api/manage/visit";
+import { listPatientInfo, delPatientInfo } from "@/api/manage/patientInfo";
+import { addPatientInfo, updatePatientInfo, getPatientInfo } from "@/api/manage/visit";
 import { getAge } from "@/utils/age";
 import { selectAgencyList, getDepartmentList, getAgencyList } from "@/api/manage/selectAgencyList";
 import { getToken } from '@/utils/auth'
@@ -420,6 +420,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      patientVisitRecordIds: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -599,6 +600,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.patientVisitRecordIds = selection.map(item => item.patientVisitRecordId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -611,7 +613,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.patientVisitRecordId || this.patientVisitRecordIds
       getPatientInfo(id).then(response => {
         this.form = response.data;
         if (this.form.hospitalAgencyId) {

From a47c75c33db39429b2a735422c27e88b0c6feaa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 28 Mar 2024 16:38:46 +0800
Subject: [PATCH 3/8] xg

---
 src/views/manage/visitin/index.vue  | 27 ++++++++++++----------
 src/views/manage/visitout/index.vue | 35 +++++++++++++++++------------
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue
index 2a06abe..6ec0cb4 100644
--- a/src/views/manage/visitin/index.vue
+++ b/src/views/manage/visitin/index.vue
@@ -174,14 +174,12 @@
       <el-table-column label="手术名称" align="center" prop="surgicalName" />
       <!-- <el-table-column label="出院方式" align="center" prop="dischargeMethod" /> -->
       <el-table-column label="患者来源" align="center" prop="patientSource">
-
         <template slot-scope="scope">
           <dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" />
         </template>
       </el-table-column>
       <el-table-column label="住址" align="center" prop="address" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="handleAuthRole(scope.row)">详情</el-button>
           <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
@@ -204,7 +202,7 @@
           <el-input v-model="form.patientPhone" placeholder="请输入患者电话" style="width:200px" maxlength="11" />
         </el-form-item>
         <el-form-item label="家属电话" prop="familyMemberPhone">
-          <el-input v-model="form.familyMemberPhone" placeholder="请输入家属电话" style="width:200px" maxlength="11"/>
+          <el-input v-model="form.familyMemberPhone" placeholder="请输入家属电话" style="width:200px" maxlength="11" />
         </el-form-item>
         <el-form-item label="出生日期" prop="birthDate">
           <el-date-picker clearable v-model="form.birthDate" style="width:200px" type="date" value-format="yyyy-MM-dd"
@@ -212,7 +210,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="身份证号" prop="cardNo">
-          <el-input v-model="form.cardNo" placeholder="请输入身份证号" style="width:200px" maxlength="18"/>
+          <el-input v-model="form.cardNo" placeholder="请输入身份证号" style="width:200px" maxlength="18" />
         </el-form-item>
         <el-form-item label="性别" prop="sex">
           <el-radio-group v-model="form.sex">
@@ -279,14 +277,17 @@
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
         </el-form-item>
-        <el-form-item label="手术名称" prop="surgicalName">
-          <el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
-        </el-form-item>
         <el-form-item label="入院时间" prop="admissionDate">
           <el-date-picker clearable v-model="form.admissionDate" type="date" value-format="yyyy-MM-dd"
             style="width:200px" placeholder="请选择入院时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="手术名称" prop="surgicalName">
+          <el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="手术记录" prop="surgicalRecord" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+          <el-input type="textarea" v-model="form.surgicalRecord" style="width:800px" placeholder="请输入手术记录" :rows="8" />
+        </el-form-item>
         <el-form-item label="病历内容">
           <editor v-model="form.medicalRecordContent" :min-height="192" />
         </el-form-item>
@@ -460,6 +461,7 @@ export default {
         wardId: null,
         wardName: null,
         surgicalName: null,
+        surgicalRecord: null,
         admissionDate: null,
         outpatientNumber: null,
         visitTime: null,
@@ -470,16 +472,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        cardNo:[
-        { required: false, message: '', trigger: 'change' },
-        {
+        cardNo: [
+          { required: false, message: '', trigger: 'change' },
+          {
             pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/,
             message: "身份证号格式有误！",
             trigger: "blur"
           }
         ],
-        familyMemberPhone:[
-        { required: false, message: '', trigger: 'change' },
+        familyMemberPhone: [
+          { required: false, message: '', trigger: 'change' },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号",
@@ -583,6 +585,7 @@ export default {
         admissionNumber: null,
         responsibleNurse: null,
         visitSerialNumber: null,
+        surgicalRecord: null,
         surgicalName: null,
         admissionDate: null,
         dischargeDate: null,
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index 2df0287..e6e002e 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -203,10 +203,10 @@
           <el-input v-model="form.patientName" placeholder="请输入患者姓名" style="width:200px" />
         </el-form-item>
         <el-form-item label="患者电话" prop="patientPhone">
-          <el-input v-model="form.patientPhone" placeholder="请输入患者电话" style="width:200px" maxlength="11"/>
+          <el-input v-model="form.patientPhone" placeholder="请输入患者电话" style="width:200px" maxlength="11" />
         </el-form-item>
         <el-form-item label="家属电话" prop="familyMemberPhone">
-          <el-input v-model="form.familyMemberPhone" placeholder="请输入家属电话" style="width:200px" maxlength="11"/>
+          <el-input v-model="form.familyMemberPhone" placeholder="请输入家属电话" style="width:200px" maxlength="11" />
         </el-form-item>
         <el-form-item label="出生日期" prop="birthDate">
           <el-date-picker clearable v-model="form.birthDate" style="width:200px" type="date" value-format="yyyy-MM-dd"
@@ -214,7 +214,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="身份证号" prop="cardNo">
-          <el-input v-model="form.cardNo" placeholder="请输入身份证号" style="width:200px" maxlength="18"/>
+          <el-input v-model="form.cardNo" placeholder="请输入身份证号" style="width:200px" maxlength="18" />
         </el-form-item>
         <el-form-item label="性别" prop="sex">
           <el-radio-group v-model="form.sex">
@@ -284,9 +284,6 @@
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
         </el-form-item>
-        <el-form-item label="手术名称" prop="surgicalName">
-          <el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
-        </el-form-item>
         <el-form-item label="就诊时间" prop="visitTime" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
           <el-date-picker clearable v-model="form.visitTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择就诊时间"
             style="width:200px">
@@ -297,6 +294,12 @@
             style="width:200px" placeholder="请选择入院时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="手术名称" prop="surgicalName">
+          <el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
+        </el-form-item>
+        <el-form-item label="手术记录" prop="surgicalRecord" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+          <el-input type="textarea" v-model="form.surgicalRecord" style="width:800px" placeholder="请输入手术记录" :rows="8" />
+        </el-form-item>
         <el-form-item label="病历内容">
           <editor v-model="form.medicalRecordContent" :min-height="192" />
         </el-form-item>
@@ -407,8 +410,8 @@
 </template>
 
 <script>
-import { listPatientInfo, getPatientInfo, delPatientInfo } from "@/api/manage/patientInfo";
-import { addPatientInfo, updatePatientInfo } from "@/api/manage/visit";
+import { listPatientInfo, delPatientInfo } from "@/api/manage/patientInfo";
+import { addPatientInfo, updatePatientInfo, getPatientInfo } from "@/api/manage/visit";
 import { getAge } from "@/utils/age";
 import { selectAgencyList, getDepartmentList, getAgencyList } from "@/api/manage/selectAgencyList";
 import { getToken } from '@/utils/auth'
@@ -445,6 +448,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      patientVisitRecordId: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -484,6 +488,7 @@ export default {
         wardId: null,
         wardName: null,
         surgicalName: null,
+        surgicalRecord: null,
         admissionDate: null,
         outpatientNumber: null,
         visitTime: null,
@@ -494,16 +499,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        cardNo:[
-        { required: false, message: '', trigger: 'change' },
-        {
+        cardNo: [
+          { required: false, message: '', trigger: 'change' },
+          {
             pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/,
             message: "身份证号格式有误！",
             trigger: "blur"
           }
         ],
-        familyMemberPhone:[
-        { required: false, message: '', trigger: 'change' },
+        familyMemberPhone: [
+          { required: false, message: '', trigger: 'change' },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号",
@@ -614,6 +619,7 @@ export default {
         responsibleNurse: null,
         visitSerialNumber: null,
         surgicalName: null,
+        surgicalRecord: null,
         admissionDate: null,
         dischargeDate: null,
         medicalRecordContent: null,
@@ -651,6 +657,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.patientVisitRecordIds = selection.map(item => item.patientVisitRecordId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -663,7 +670,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.patientVisitRecordId || this.patientVisitRecordIds
       getPatientInfo(id).then(response => {
         this.form = response.data;
         this.form = response.data;

From 214e5ee259a3ecf3bb9f2058bde85258d2141efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 28 Mar 2024 17:14:14 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/departmentDisease/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/departmentDisease/index.vue b/src/views/system/departmentDisease/index.vue
index 3e3242d..626c2c9 100644
--- a/src/views/system/departmentDisease/index.vue
+++ b/src/views/system/departmentDisease/index.vue
@@ -702,9 +702,9 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      if (this.itemname == null) {
+      // if (this.itemname == null) {
         this.form.departmentName = "请选择科室";
-      }
+      // }
       this.title = "添加科室病种信息";
     },
     /** 修改按钮操作 */

From 42ab6e14fd01df592502a61bf05a3f9075960a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 28 Mar 2024 17:24:06 +0800
Subject: [PATCH 5/8] xg

---
 src/api/manage/visit.js                       |  8 ++
 src/views/manage/visitout/index.vue           | 89 ++++++++++++++++++-
 .../index.vue                                 | 18 +++-
 3 files changed, 111 insertions(+), 4 deletions(-)

diff --git a/src/api/manage/visit.js b/src/api/manage/visit.js
index 7fbcb6c..c4c2866 100644
--- a/src/api/manage/visit.js
+++ b/src/api/manage/visit.js
@@ -25,4 +25,12 @@ export function getPatientInfo(id) {
         method: 'get'
     })
 }
+// 意向签约
+export function intentionalSign(data) {
+    return request({
+        url: '/manage/signRecord/intentionalSign',
+        method: 'post',
+        data: data
+    })
+}
 
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index e6e002e..eb9ac40 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -183,8 +183,9 @@
         </template>
       </el-table-column>
       <el-table-column label="住址" align="center" prop="address" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
         <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="addsign(scope.row)">意向签约</el-button>
           <el-button size="mini" type="text" @click="handleAuthRole(scope.row)">详情</el-button>
           <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
             v-hasPermi="['manage:preHospitalized:edit']">编辑</el-button>
@@ -294,6 +295,11 @@
             style="width:200px" placeholder="请选择入院时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="出院时间" prop="dischargeTime" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+          <el-date-picker clearable v-model="form.dischargeTime" type="date" value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions" style="width:200px" placeholder="请选择出院时间">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="手术名称" prop="surgicalName">
           <el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
         </el-form-item>
@@ -366,7 +372,30 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
+    <!-- 意向签约 -->
+    <el-dialog title="意向签约" :visible.sync="addsignopen" width="500px" append-to-body>
+      <el-form ref="form" :model="addsignform" :rules="rules" label-width="100px">
+        <el-form-item label="开单医生" prop="billingDoctorId">
+          <el-select v-model="addsignform.billingDoctorId" filterable placeholder="请选择开单医生" style="width:200px"
+            clearable>
+            <el-option v-for="item in addsignattendingPhysicianlist" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="意向来源" prop="intentionalSource">
+          <el-select v-model="addsignform.intentionalSource" filterable placeholder="请选择意向来源" style="width:200px"
+            clearable>
+            <el-option label="医生开单" value="DOCTOR_BILLING">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="addsignupload">确 定</el-button>
+        <el-button @click="addsignopen = false">取 消</el-button>
+      </div>
+    </el-dialog>
     <!-- //导入 -->
     <el-dialog title="导入门诊患者信息" :visible.sync="uploadopen" width="400px" append-to-body>
       <el-upload drag class="upload-demo" ref="upload" :action="action.url" :headers="action.headers"
@@ -411,7 +440,7 @@
 
 <script>
 import { listPatientInfo, delPatientInfo } from "@/api/manage/patientInfo";
-import { addPatientInfo, updatePatientInfo, getPatientInfo } from "@/api/manage/visit";
+import { addPatientInfo, updatePatientInfo, getPatientInfo, intentionalSign } from "@/api/manage/visit";
 import { getAge } from "@/utils/age";
 import { selectAgencyList, getDepartmentList, getAgencyList } from "@/api/manage/selectAgencyList";
 import { getToken } from '@/utils/auth'
@@ -422,6 +451,14 @@ export default {
   dicts: ['patient_type', 'visit_method', 'sign_status', 'patient_source'],
   data() {
     return {
+      pickerOptions: {
+        disabledDate: (time) => {
+          if (this.form.admissionDate != "") {
+            return time.getTime() < new Date(this.form.admissionDate).getTime();
+          }
+        },
+      },
+      addsignopen: false,
       //医生
       attendingPhysicianlist: [],
       //form-医生
@@ -490,6 +527,7 @@ export default {
         surgicalName: null,
         surgicalRecord: null,
         admissionDate: null,
+        dischargeTime: null,
         outpatientNumber: null,
         visitTime: null,
         dischargeMethod: null,
@@ -533,9 +571,18 @@ export default {
         admissionDate: [
           { required: true, message: '请选择患者入院时间', trigger: 'change' }
         ],
+        dischargeTime: [
+          { required: true, message: '请选择患者出院时间', trigger: 'change' }
+        ],
         visitTime: [
           { required: true, message: '请选择患者就诊时间', trigger: 'change' }
         ],
+        billingDoctorId: [
+          { required: true, message: '请选择开单医生', trigger: 'change' }
+        ],
+        intentionalSource: [
+          { required: true, message: '请选择意向来源', trigger: 'change' }
+        ],
       },
       action: {
         data: {
@@ -549,6 +596,14 @@ export default {
         },
         url: process.env.VUE_APP_BASE_API + '/manage/visitRecord/importPatientInfo'
       },
+      //意向签约开单医生
+      addsignattendingPhysicianlist: [],
+      addsignform: {
+        billingDoctorId: '',
+        billingDoctorName: '',
+        intentionalSource: '',
+        patientId: '',
+      },
     };
   },
   created() {
@@ -556,6 +611,33 @@ export default {
     this.selectAgencyinfo();
   },
   methods: {
+    addsignupload() {
+      if (this.addsignform.billingDoctorId && this.addsignattendingPhysicianlist.length > 0) {
+        this.addsignform.billingDoctorName = this.addsignattendingPhysicianlist.find(e => e.userId == this.addsignform.billingDoctorId).nickName
+      }
+      intentionalSign(this.addsignform).then(res => {
+        this.$modal.msgSuccess("意向签约成功");
+      })
+    },
+    addsign(item) {
+      this.addsignform = {
+        billingDoctorId: '',
+        billingDoctorName: '',
+        intentionalSource: '',
+        patientId: item.id,
+      }
+      this.usergetListinfotwo(item.hospitalAgencyId)
+      this.addsignopen = true
+    },
+    //开单医生
+    usergetListinfotwo(id) {
+      usergetList({
+        agencyId: id,
+        postName: 'DOCTOR'
+      }).then(res => {
+        this.addsignattendingPhysicianlist = res.data
+      })
+    },
     /** 详情操作 */
     handleAuthRole(row) {
       this.$router.push({
@@ -621,6 +703,7 @@ export default {
         surgicalName: null,
         surgicalRecord: null,
         admissionDate: null,
+        dischargeTime: null,
         dischargeDate: null,
         medicalRecordContent: null,
         appointmentTreatmentGroup: null,
diff --git a/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue b/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue
index 444f352..18d2b77 100644
--- a/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue
+++ b/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue
@@ -45,7 +45,7 @@
                         </el-radio-group>
                     </el-form-item>
                 </el-form>
-                <el-form ref="form" :model="form" :rules="rules" label-width="120px" :inline="true">
+                <el-form ref="form" :model="form" :rules="rules" label-width="130px" :inline="true">
                     <el-form-item label="主要诊断" prop="mainDiagnosis">
                         <el-input v-model="form.mainDiagnosis" style="width:300px" placeholder="请输入主要诊断"></el-input>
                     </el-form-item>
@@ -69,6 +69,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="门诊/住院编号" prop="inHospitalNumber">
+                        <el-input v-model="form.inHospitalNumber" style="width:300px"
+                            placeholder="请输入门诊/住院编号"></el-input>
+                    </el-form-item>
                     <el-form-item label="入院时间" prop="admissionTime">
                         <el-date-picker style="width:300px" v-model="form.admissionTime" type="datetime"
                             :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间">
@@ -79,6 +83,10 @@
                             :picker-options="pickerOptionstwo" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间">
                         </el-date-picker>
                     </el-form-item>
+                    <el-form-item label="手术记录" prop="surgicalRecord" v-if="form.visitMethod == 'BE_HOSPITALIZED'">
+                        <el-input type="textarea" v-model="form.surgicalRecord" style="width:800px"
+                            :rows="8"></el-input>
+                    </el-form-item>
                     <el-form-item label="入院病历" prop="inHospitalInfo" v-if="form.visitMethod == 'BE_HOSPITALIZED'">
                         <el-input type="textarea" v-model="form.inHospitalInfo" style="width:800px"
                             :rows="8"></el-input>
@@ -134,6 +142,9 @@ export default {
                 attendingPhysicianId: [
                     { required: true, message: "主治医生不能为空", trigger: "blur" }
                 ],
+                inHospitalNumber: [
+                    { required: true, message: "门诊/住院编号不能为空", trigger: "blur" }
+                ],
                 departmentId: [
                     { required: true, message: "科室名称不能为空", trigger: "blur" }
                 ],
@@ -143,6 +154,9 @@ export default {
                 dischargeTime: [
                     { required: true, message: "出院时间不能为空", trigger: "blur" }
                 ],
+                surgicalRecord: [
+                    { required: true, message: "手术记录不能为空", trigger: "blur" }
+                ],
                 inHospitalInfo: [
                     { required: true, message: "病历不能为空", trigger: "blur" }
                 ],
@@ -170,10 +184,12 @@ export default {
                 departmentId: '',
                 departmentName: '',
                 attendingPhysicianId: '',
+                inHospitalNumber: '',
                 attendingPhysicianName: '',
                 admissionTime: this.todaytime,
                 dischargeTime: '',
                 inHospitalInfo: '',
+                surgicalRecord: '',
                 outHospitalInfo: '',
             }
             this.recodelist.unshift(item)

From a663020667b15aaf6baac1ca067995f2bc753857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 28 Mar 2024 17:26:14 +0800
Subject: [PATCH 6/8] xg

---
 src/views/manage/visitout/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index eb9ac40..1126d25 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -627,6 +627,7 @@ export default {
         patientId: item.id,
       }
       this.usergetListinfotwo(item.hospitalAgencyId)
+      this.resetForm("addsignform");
       this.addsignopen = true
     },
     //开单医生

From 9fd7d476cfebc1aa357d82508ea2575ff63b5feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 28 Mar 2024 17:27:53 +0800
Subject: [PATCH 7/8] xg

---
 src/views/manage/visitout/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index 1126d25..3b56517 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -374,7 +374,7 @@
     </el-dialog>
     <!-- 意向签约 -->
     <el-dialog title="意向签约" :visible.sync="addsignopen" width="500px" append-to-body>
-      <el-form ref="form" :model="addsignform" :rules="rules" label-width="100px">
+      <el-form ref="addsignform" :model="addsignform" :rules="rules" label-width="100px">
         <el-form-item label="开单医生" prop="billingDoctorId">
           <el-select v-model="addsignform.billingDoctorId" filterable placeholder="请选择开单医生" style="width:200px"
             clearable>
@@ -617,6 +617,7 @@ export default {
       }
       intentionalSign(this.addsignform).then(res => {
         this.$modal.msgSuccess("意向签约成功");
+        this.addsignopen = false
       })
     },
     addsign(item) {

From b9a47d8c1357e6478df9ed9c3dd75bf372d26249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 28 Mar 2024 17:35:15 +0800
Subject: [PATCH 8/8] xg

---
 src/views/manage/continueSigning/index.vue | 1 +
 src/views/manage/newSigning/index.vue      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/manage/continueSigning/index.vue b/src/views/manage/continueSigning/index.vue
index 9f83bef..570051c 100644
--- a/src/views/manage/continueSigning/index.vue
+++ b/src/views/manage/continueSigning/index.vue
@@ -163,6 +163,7 @@ export default {
             },
             list: {},
             form: {
+                signCategory: 'reSign',
                 record: {
                     patientId: undefined,
                     patientPhone: undefined,
diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue
index e377697..50a4917 100644
--- a/src/views/manage/newSigning/index.vue
+++ b/src/views/manage/newSigning/index.vue
@@ -142,6 +142,7 @@ export default {
                 packagePaymentStatus: '',
             },
             form: {
+                signCategory: 'sign',
                 record: {
                     patientId: undefined,
                     patientPhone: undefined,