diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue
index 68dc563..524285e 100644
--- a/src/views/manage/patientInfo/index.vue
+++ b/src/views/manage/patientInfo/index.vue
@@ -84,8 +84,8 @@
           <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="入院时间" prop="admissionDateStart">
-        <el-date-picker v-model="admissionDate" type="daterange" range-separator="至" start-placeholder="开始日期"
+      <!-- <el-form-item label="入院时间" prop="admissionTimeStart">
+        <el-date-picker v-model="admissionTime" type="daterange" range-separator="至" start-placeholder="开始日期"
           style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item> -->
@@ -124,7 +124,7 @@
         </template>
       </el-table-column>
       <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
-      <!-- <el-table-column label="入院时间" align="center" prop="admissionDate" width='130' /> -->
+      <!-- <el-table-column label="入院时间" align="center" prop="admissionTime" width='130' /> -->
       <el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
       <el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
       <el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
@@ -195,8 +195,8 @@ export default {
         wardId: null,
         wardName: null,
         surgicalName: null,
-        admissionDateStart: null,
-        admissionDateEnd: null,
+        admissionTimeStart: null,
+        admissionTimeEnd: null,
         outpatientNumber: null,
         visitTimeStart: null,
         visitTimeEnd: null,
@@ -204,7 +204,7 @@ export default {
         patientSource: null,
       },
       visitTime: [],
-      admissionDate: [],
+      admissionTime: [],
       //医院list
       hospitalAgencylist: [],
       // 院区list
@@ -268,18 +268,18 @@ export default {
         this.queryParams.visitTimeStart = this.visitTime[0]
         this.queryParams.visitTimeEnd = this.visitTime[1]
       }
-      if (this.admissionDate.length > 0) {
-        this.queryParams.admissionDateStart = this.admissionDate[0]
-        this.queryParams.admissionDateEnd = this.admissionDate[1]
+      if (this.admissionTime.length > 0) {
+        this.queryParams.admissionTimeStart = this.admissionTime[0]
+        this.queryParams.admissionTimeEnd = this.admissionTime[1]
       }
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.admissionDate = [];
-      this.queryParams.admissionDateStart = null
-      this.queryParams.admissionDateEnd = null
+      this.admissionTime = [];
+      this.queryParams.admissionTimeStart = null
+      this.queryParams.admissionTimeEnd = null
       this.visitTime = []
       this.queryParams.visitTimeStart = null
       this.queryParams.visitTimeEnd = null
diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue
index c85e88f..feab1be 100644
--- a/src/views/manage/preHospitalized/index.vue
+++ b/src/views/manage/preHospitalized/index.vue
@@ -19,8 +19,8 @@
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="入院时间" prop="admissionDate">
-        <el-date-picker v-model="queryParams.admissionDate" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
+      <el-form-item label="入院时间" prop="admissionTime">
+        <el-date-picker v-model="queryParams.admissionTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item> -->
       <!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
@@ -166,7 +166,7 @@
           <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
         </template>
       </el-table-column>
-      <el-table-column label="入院时间" align="center" prop="admissionDate" width='130' />
+      <el-table-column label="入院时间" align="center" prop="admissionTime" width='130' />
       <el-table-column label="主治医生" align="center" prop="attendingPhysician" /> 
      <el-table-column label="出院方式" align="center" prop="dischargeMethod" /> 
       <el-table-column label="患者来源" align="center" prop="patientSource">
@@ -319,13 +319,13 @@
         <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"
+        <el-form-item label="入院时间" prop="admissionTime">
+          <el-date-picker clearable v-model="form.admissionTime" type="date" value-format="yyyy-MM-dd" style="width:200px"
             placeholder="请选择入院时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="出院时间" prop="dischargeDate">
-          <el-date-picker clearable v-model="form.dischargeDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
+        <el-form-item label="出院时间" prop="dischargeTime">
+          <el-date-picker clearable v-model="form.dischargeTime" type="date" value-format="yyyy-MM-dd" style="width:200px"
             placeholder="请选择出院时间">
           </el-date-picker>
         </el-form-item>
@@ -452,7 +452,7 @@ export default {
         wardId: null,
         wardName: null,
         surgicalName: null,
-        admissionDate: null,
+        admissionTime: null,
         outpatientNumber: null,
         visitTime: null,
         dischargeMethod: null,
diff --git a/src/views/manage/propaganda/index.vue b/src/views/manage/propaganda/index.vue
index d6238c0..4c0e662 100644
--- a/src/views/manage/propaganda/index.vue
+++ b/src/views/manage/propaganda/index.vue
@@ -17,8 +17,8 @@
           @change="changecreateTimeStart"
           :picker-options="pickerStartTime"
         >
-        </el-date-picker
-        > -
+        </el-date-picker>
+        -
         <el-date-picker
           v-model="queryParams.createTimeEnd"
           type="date"
@@ -185,6 +185,7 @@
             label="宣教ID"
             align="center"
             prop="propagandaCode"
+            :show-overflow-tooltip="true"
           />
           <el-table-column
             label="宣教状态"
@@ -243,7 +244,7 @@
                 size="mini"
                 type="text"
                 icon="el-icon-aim"
-                v-if="scope.row.propagandaStatus=='CREATE_COMPLETE'"
+                v-if="scope.row.propagandaStatus == 'CREATE_COMPLETE'"
                 @click="examine(scope.row)"
                 >审核</el-button
               >
@@ -273,37 +274,45 @@
             </template>
           </el-table-column>
         </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
     <!-- 添加或修改患者宣教信息对话框 -->
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="500px"
+      width="1000px"
       append-to-body
       v-if="open"
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+        :inline="true"
+      >
         <el-form-item label="宣教标题" prop="propagandaTitle">
           <el-input
             v-model="form.propagandaTitle"
             placeholder="请输入宣教标题"
           />
         </el-form-item>
+        <el-form-item label="宣教ID" prop="propagandaCode">
+          <el-input v-model="form.propagandaCode" placeholder="请输入宣教ID" />
+        </el-form-item>
         <el-form-item label="宣教类型" prop="propagandaType">
           <el-select
             v-model="form.propagandaType"
             placeholder="请选择"
-            style="width: 378px"
+            style="width: 206px"
           >
             <el-option
               v-for="item in optionstype"
@@ -315,24 +324,53 @@
           </el-select>
         </el-form-item>
         <el-form-item label="医院名称" prop="hospitalAgencyName">
-          <el-input
+          <el-select
+            v-model="form.hospitalAgencyName"
+            filterable
+            placeholder="请选择医院"
+            style="width: 200px"
+            clearable
+            @change="changehospitalAgency"
+          >
+            <el-option
+              v-for="item in hospitalAgencylist"
+              :key="item.id"
+              :label="item.agencyName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          <!-- <el-input
             v-model="form.hospitalAgencyName"
             placeholder="请输入医院名称"
-          />
+          /> -->
         </el-form-item>
-        <!-- <el-form-item label="医生名称" prop="departmentName">
-          <el-input
-            v-model="form.departmentName"
-            placeholder="请输入医生名称"
-          />
-        </el-form-item> -->
+
         <el-form-item label="科室名称" prop="departmentId">
-          <el-button
+          <el-select
+            v-model="form.departmentName"
+            filterable
+            placeholder="请选择医院"
+            style="width: 200px"
+            clearable
+            @change="changeDepartment"
+            @focus="onBlur"
+          >
+            <el-option
+              v-for="item in Departmentdata"
+              :key="item.id"
+              :label="item.departmentName"
+              :value="item.departmentCode"
+            >
+            </el-option>
+          </el-select>
+
+          <!-- <el-button
             type=""
             v-if="departmentName == '请选择科室'"
             @click="clickinnerVisible()"
             style="
-              width: 379px;
+              width: 206px;
               text-align: left;
               height: 36px;
               color: #c0c4cc;
@@ -345,14 +383,14 @@
             type=""
             v-else
             style="
-              width: 379px;
+              width: 206px;
               text-align: left;
               height: 36px;
               padding-left: -10px;
               overflow: hidden;
             "
             >{{ departmentName }}</el-button
-          >
+          > -->
         </el-form-item>
         <el-form-item label="病种名称" prop="diseaseTypeName">
           <el-button
@@ -360,7 +398,7 @@
             v-if="diseaseTypeName == '请选择病种'"
             @click="clickdisease()"
             style="
-              width: 379px;
+              width: 206px;
               text-align: left;
               height: 36px;
               color: #c0c4cc;
@@ -373,7 +411,7 @@
             type=""
             v-else
             style="
-              width: 379px;
+              width: 206px;
               text-align: left;
               height: 36px;
               padding-left: -10px;
@@ -382,6 +420,23 @@
             >{{ diseaseTypeName }}</el-button
           >
         </el-form-item>
+
+        <el-form-item label="语音播报" prop="voicebroadcast">
+          <el-input
+            v-model="form.voicebroadcast"
+            type="textarea"
+            style="width: 206px"
+            placeholder="请输入语音播报"
+          />
+        </el-form-item>
+        <el-form-item label="宣教正文内容" prop="propagandaContent">
+          <el-input
+            v-model="form.propagandaContent"
+            type="textarea"
+            style="width: 206px"
+            placeholder="请输入宣教正文内容"
+          />
+        </el-form-item>
         <el-form-item label="添加封面" prop="propagandaCoverPath">
           <stationAcatar
             @imgUrl="imgUrl"
@@ -389,19 +444,27 @@
             :type="'propagandaCoverUrl'"
           />
         </el-form-item>
-        <el-form-item label="语音播报" prop="voicebroadcast">
-          <el-input
-            v-model="form.voicebroadcast"
-            type="textarea"
-            placeholder="请输入语音播报"
-          />
-        </el-form-item>
-        <el-form-item label="宣教正文内容" prop="propagandaContent">
-          <el-input
-            v-model="form.propagandaContent"
-            type="textarea"
-            placeholder="请输入宣教正文内容"
+        <el-form-item label="素材选择" prop="imgPath">
+          <div class="propagandaselect" @click="material" v-if="!form.imgPath">
+            <div class="add">+</div>
+          </div>
+          <img
+            @click="material"
+            class="propagandaselect"
+            :src="baseUrl + form.imgPath"
+            alt=""
+            v-else-if="
+              form.imgPath && querymaterial.materialsType == 'IMAGE_TEXT'
+            "
           />
+          <video
+            @click="material"
+            style="height: 200px; width: 300px"
+            v-else-if="form.imgPath && querymaterial.materialsType == 'VIDEO'"
+            ref="myVideo"
+            :src="baseUrl + form.imgPath"
+            controls
+          ></video>
         </el-form-item>
         <el-form-item label="文章摘要" prop="articleSummary">
           <editor v-model="form.articleSummary" :min-height="192" />
@@ -593,7 +656,7 @@
           <audio controls="controls" ref="audio"></audio>
         </div> -->
         <div>
-          <img src="@/assets/system/userinfo.jpg" alt="" />
+          <img :src="baseUrl + formview.propagandaCoverPath" alt="" />
           <div class="know">知识卡片</div>
           <div class="knowlist">
             {{ formview.propagandaContent }}
@@ -602,11 +665,149 @@
         </div>
       </div>
     </el-dialog>
+    <!-- 素材选择弹框 -->
+    <el-dialog
+      title="请选择素材"
+      :visible.sync="dialogmaterial"
+      width="900px"
+      :before-close="materialClose"
+    >
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-form-item label="素材名称" prop="materialsName">
+          <el-input
+            v-model="querymaterial.materialsName"
+            placeholder="请输入素材名称"
+            clearable
+            @keyup.enter.native="handleQuerysc"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuerysc"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuerysc"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+
+      <el-tabs
+        v-model="querymaterial.materialsType"
+        type="card"
+        @tab-click="handleClick"
+      >
+        <el-tab-pane label="图片" name="IMAGE_TEXT"></el-tab-pane>
+        <el-tab-pane label="视频" name="VIDEO"></el-tab-pane>
+      </el-tabs>
+      <div class="bodytopxj">
+        <div class="bodylist" v-for="item in materialsList" :key="item.id">
+          <!-- <el-checkbox
+            v-model="item.checked"
+            @change="changecheck($event, item)"
+          ></el-checkbox> -->
+          <div @click.stop="viewshow(item)">
+            <img
+              :src="baseUrl + item.materialsFilePath"
+              alt=""
+              v-if="item.materialsFilePath && !item.videoCoverFilePath"
+            />
+            <img
+              :src="baseUrl + item.videoCoverFilePath"
+              alt=""
+              v-if="item.videoCoverFilePath && item.materialsFilePath"
+            />
+            <div class="texttitle">{{ item.materialsName }}</div>
+            <div class="dataliat">
+              创建人/创建时间：<span>{{ item.createBy }}</span
+              >/<span>{{ item.createTime }}</span>
+            </div>
+            <div class="dataliat">素材来源：</div>
+            <!-- <div class="dataliat">标签：暂无</div> -->
+            <div class="dataliat bq">
+              标签：
+
+              <span v-if="item.indications">{{ item.indications }}，</span>
+              <span v-if="item.drugName">{{ item.drugName }}，</span>
+              <span v-if="item.applicableDiseases"
+                >{{ item.applicableDiseases }}，</span
+              >
+              <span v-if="item.surgicalName">{{ item.surgicalName }}，</span>
+              <span v-if="item.inspectionItems"
+                >{{ item.inspectionItems }}，</span
+              >
+              <span v-if="item.checkItems">{{ item.checkItems }}，</span>
+            </div>
+          </div>
+
+          <div class="label" @click.stop="labelchange(item)">加到文章</div>
+        </div>
+      </div>
+
+      <pagination
+        v-show="totalmaterial > 0"
+        :total="totalmaterial"
+        :page.sync="querymaterial.pageNum"
+        :limit.sync="querymaterial.pageSize"
+        @pagination="getmaterial"
+      />
+    </el-dialog>
+    <!-- 预览弹框 -->
+    <el-dialog title="预览" :visible.sync="openview" width="60%">
+      <div class="viewbody">
+        <div class="left">
+          <video
+            v-if="querymaterial.materialsType == 'VIDEO'"
+            ref="myVideo"
+            :src="baseUrl + viewform.materialsFilePath"
+            controls
+          ></video>
+          <img
+            :src="baseUrl + viewform.materialsFilePath"
+            alt=""
+            v-if="querymaterial.materialsType == 'IMAGE_TEXT'"
+          />
+        </div>
+        <div class="right">
+          <div class="nametitle">素材名称</div>
+          <div class="nameitem">{{ viewform.materialsName }}</div>
+          <div class="nametitle">创建人员</div>
+          <div class="nameitem">{{ viewform.createBy }}</div>
+          <div class="nametitle">创建时间</div>
+          <div class="nameitem">{{ viewform.createTime }}</div>
+          <div class="nametitle">素材摘要</div>
+          <div class="nameitem">{{ viewform.materialsAbstract }}</div>
+          <div class="nametitle">素材标签：</div>
+          <div class="nameitem">适用症状：{{ viewform.indications }}</div>
+          <div class="nameitem">药物名称：{{ viewform.drugName }}</div>
+          <div class="nameitem">
+            适用疾病：{{ viewform.applicableDiseases }}
+          </div>
+          <div class="nameitem">手术名称：{{ viewform.surgicalName }}</div>
+          <div class="nameitem">检验项目：{{ viewform.inspectionItems }}</div>
+          <div class="nameitem">检查项目：{{ viewform.checkItems }}</div>
+          <div class="nameitem">人群：{{ viewform.crowName }}</div>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listPropaganda, getPropaganda, delPropaganda, addPropaganda, updatePropaganda, selectNumByDept, copy, updateStatus } from "@/api/manage/propaganda";
+import { listMaterials } from "@/api/manage/materials";
+import { selectAgencyList, getDepartmentList } from "@/api/manage/selectAgencyList";
+
 import stationAcatar from "../../system/stationAvatar/index.vue";
 import { department, listDisease } from "@/api/manage/script";
 export default {
@@ -644,8 +845,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
-        diseaseTypeName:null,
-        departmentId:null,
+        diseaseTypeName: null,
+        departmentId: null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -694,6 +895,26 @@ export default {
         value: 'REVIEW_FAILED',
         label: '审核不通过'
       }],
+      // 素材弹框
+      dialogmaterial: false,
+      // 素材信息表格数据
+      materialsList: [],
+      // 查询参数
+      querymaterial: {
+        pageNum: 1,
+        pageSize: 10,
+        materialsType: 'IMAGE_TEXT',
+        materialsName: null,
+        materialsStatus: null,
+        createTime: null,
+      },
+      totalmaterial: 0,
+      baseUrl: process.env.VUE_APP_BASE_API,
+      openview: false,
+      viewform: [],
+      //医院list
+      hospitalAgencylist: [],
+      Departmentdata: [],
       value: '',
       // 遮罩层
       // loading: true,
@@ -736,19 +957,25 @@ export default {
         propagandaBarcodePath: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        materialsInfoList: [],
+      },
       // 表单校验
       rules: {
+        hospitalAgencyName: [
+          { required: true, message: "医院名称不能为空", trigger: "blur" }
+        ],
         departmentId: [
           { required: true, message: "科室名称不能为空", trigger: "blur" }
         ],
         propagandaType: [
           { required: true, message: "宣教类型不能为空", trigger: "blur" }
         ],
-        propagandaCoverPath:[
-        { required: true, message: "封面不能为空", trigger: "blur" }
-
-
+        propagandaCoverPath: [
+          { required: true, message: "封面不能为空", trigger: "blur" }
+        ],
+        imgPath: [
+          { required: true, message: "素材选择不能为空", trigger: "blur" }
         ],
       },
     };
@@ -778,6 +1005,7 @@ export default {
   created() {
     this.Departmentlist();
     this.getList();
+    this.selectAgencyinfo();
   },
   watch: {
     name(val) {
@@ -786,6 +1014,104 @@ export default {
     }
   },
   methods: {
+    //获取医院list
+    selectAgencyinfo() {
+      let query = {
+        nodeType: 'HOSPITAL',
+      }
+      selectAgencyList(query).then(res => {
+        this.hospitalAgencylist = res.data
+      })
+    },
+    // 医院
+    changehospitalAgency(e) {
+      this.form.hospitalAgencyName = this.hospitalAgencylist.find(f => f.id == e).agencyName
+      this.form.hospitalAgencyId = e
+
+      // hospitalAgencyId
+
+      this.form.departmentName = ''
+      this.form.departmentId = ''
+      this.diseaseTypeName = '请选择病种'
+      this.form.diseaseTypeId = '';
+      let query = {
+        nodeType: 'DEPARTMENT',
+        agencyId: e,
+      }
+      getDepartmentList(query).then(res => {
+        this.Departmentdata = res.data
+      })
+      console.log(e)
+    },
+    // 科室点击事件
+    changeDepartment(e) {
+      this.form.departmentId = e
+      this.form.departmentName = this.Departmentdata.find(f => f.departmentCode == e).departmentName
+      this.diseaseTypeName = '请选择病种'
+      this.form.diseaseTypeId = '';
+      console.log(this.form)
+
+
+
+    },
+    onBlur() {
+      console.log(this.form, '------------------')
+      if (!this.form.hospitalAgencyName) {
+        this.$modal.msgError("请先选择医院");
+      }
+
+    },
+    // 素材选择
+    material() {
+      this.dialogmaterial = true
+      this.querymaterial.materialsType = 'IMAGE_TEXT',
+        this.getmaterial()
+
+    },
+    // 关闭素材
+    materialClose() {
+      this.dialogmaterial = false
+    },
+    // 复选框点击事件
+    // changecheck(e, item) {
+    //   this.ids = this.materialsList.map(item => item.checked ? item.id : undefined).filter(e => e)
+    //   if (this.ids.length > 0) {
+    //     this.multiple = false
+    //   } else {
+    //     this.multiple = true
+    //   }
+    // },
+    // 图片/视频
+    handleClick(e) {
+      this.querymaterial.materialsType = e.name
+      this.getmaterial()
+    },
+    // 加到文章
+    labelchange(item) {
+      this.form.materialsInfoList = []
+      this.form.imgPath = item.materialsFilePath
+      this.form.materialsInfoList.push(item)
+
+      this.dialogmaterial = false
+      console.log(item)
+
+    },
+    // 预览
+    viewshow(item) {
+      this.openview = true
+      this.viewform = item
+
+    },
+    /** 查询素材信息列表 */
+    getmaterial() {
+      this.loading = true;
+      this.querymaterial.params = {};
+      listMaterials(this.querymaterial).then(response => {
+        this.materialsList = response.rows;
+        this.totalmaterial = response.total;
+        this.loading = false;
+      });
+    },
     // 开始时间
     changecreateTimeStart(e) {
       this.queryParams.createTimeStart = e
@@ -907,7 +1233,7 @@ export default {
     itemdata(item) {
       if (item) {
         this.itemname = item.id
-        this.departmentName = item.departmentName
+        // this.departmentName = item.departmentName
         this.loading = true;
         this.queryParams.departmentId = item.id
         this.getList()
@@ -979,7 +1305,7 @@ export default {
     },
     // 点击病种
     clickdisease() {
-      if (this.departmentName == '请选择科室') {
+      if (!this.form.departmentName) {
         this.$modal.msgError("请先选择科室");
       } else {
         this.diseaseshowst = true;
@@ -1013,13 +1339,17 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        imgPath: null,
+        materialsInfoList: [],
+        hospitalAgencyId: null,
         id: null,
         patientId: null,
         propagandaId: null,
-        propagandaStatus:null,
+        propagandaStatus: null,
         departmentName: null,
         propagandaTitle: null,
-        departmentId:null,
+        propagandaCode: null,
+        departmentId: null,
         propagandaType: null,
         propagandaCode: null,
         propagandaContent: null,
@@ -1042,6 +1372,16 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    handleQuerysc() {
+      this.querymaterial.pageNum = 1;
+      this.getmaterial();
+    },
+    resetQuerysc() {
+      this.querymaterial.materialsName = null
+      this.handleQuerysc()
+
+    },
+
     /** 重置按钮操作 */
     resetQuery() {
       // this.queryParams.departmentId = null;
@@ -1060,46 +1400,29 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.form.propagandaStatus='CREATE_COMPLETE'
-      if (this.itemname) {
-        this.form.departmentName = this.departmentName
-        this.form.departmentId = this.itemname
-      } else if (this.itemname == null) {
-        this.departmentName = "请选择科室"
-      }
-      else {
-        this.departmentName = "请选择科室"
-      }
+      this.selectAgencyinfo();
+      this.form.propagandaStatus = 'CREATE_COMPLETE'
       this.diseaseTypeName = "请选择病种"
-
+      this.Departmentdata = []
       this.open = true;
       this.title = "新增宣教";
+      console.log(this.form, '90909090')
     },
     /** 修改按钮操作 */
-    // handleUpdate(row) {
-    //   this.reset();
-    //   const id = row.id || this.ids
-    //   getPropaganda(id).then(response => {
-    //     this.form = response.data;
-    //     this.open = true;
-    //     this.title = "修改患者宣教信息";
-    //   });
-    // },
-    /** 修改按钮操作 */
     handleUpdate(row) {
-      // if (!this.itemname) {
-      //   this.$modal.msgError("请先选择科室");
-      // } else {
-        // this.reset();
-        const id = row.id || this.ids
-        getPropaganda(id).then(response => {
-          this.form = response.data;
-          this.form.suitTaskTypeIds = response.data.suitTaskTypeIds
-          this.diseaseTypeName = response.data.diseaseTypeName
-          this.departmentName = response.data.departmentName
-          this.open = true;
-          this.title = "修改患者宣教信息";
-        });
+
+      this.reset();
+      const id = row.id || this.ids
+      getPropaganda(id).then(response => {
+        this.form = response.data;
+        this.form.suitTaskTypeIds = response.data.suitTaskTypeIds
+        this.diseaseTypeName = response.data.diseaseTypeName
+        // this.form.agencyName = response.data.hospitalAgencyName
+        this.form.imgPath = response.data.materialsInfoList[0].materialsFilePath
+        this.querymaterial.materialsType = response.data.materialsInfoList[0].materialsType
+        this.open = true;
+        this.title = "修改患者宣教信息";
+      });
       // }
     },
     // 上传封面
@@ -1108,11 +1431,13 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      // return
       console.log(this.form)
+
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            this.form.departmentName = this.departmentName
+
             this.form.diseaseTypeName = this.diseaseTypeName
             updatePropaganda(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -1120,20 +1445,11 @@ export default {
               this.getList();
             });
           } else {
-            if (this.diseaseTypeName == "请选择病种") {
-              this.form.diseaseTypeName == null
+            if (this.diseaseTypeName = '请选择病种') {
+              this.form.diseaseTypeName = null
             } else {
               this.form.diseaseTypeName = this.diseaseTypeName
             }
-            if (this.itemname) {
-
-              this.form.departmentName = this.departmentName
-              this.form.departmentId = this.itemname
-
-            } else {
-              this.form.departmentName = this.departmentName
-
-            }
             addPropaganda(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -1166,6 +1482,19 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.propagandaselect {
+  width: 100px;
+  height: 100px;
+  background: #fafafa;
+  .add {
+    color: #b6b6b7;
+    font-size: 22px;
+    line-height: 100px;
+    text-align: center; //水平居中
+    // margin: 0 auto;
+  }
+}
+
 .leftpro {
   height: 760px;
   overflow: auto;
@@ -1230,8 +1559,9 @@ audio {
     margin: 10px 0px 10px 30px;
   }
   img {
-    width: 362px;
-    height: 127px;
+    // width: 100%;
+    // width: 362px;
+    // height: 127px;
     margin: 0px 0px 0px 30px;
   }
   .know {
@@ -1243,4 +1573,87 @@ audio {
     font-size: 16px;
   }
 }
+
+.viewbody {
+  width: 100%;
+  height: 500px;
+  // background: #409eff;
+  display: flex;
+  .left {
+    overflow: auto;
+    width: 77%;
+    height: 500px;
+    // background: #989992;
+    video {
+      height: 500px;
+      width: 100%;
+    }
+  }
+  img {
+    // height: 100%;
+    // width: 100%;
+  }
+  .right {
+    width: 20%;
+    // background: red;
+    margin-left: 30px;
+    .nametitle {
+      font-size: 14px;
+      font-weight: 600;
+    }
+    .nameitem {
+      color: #959595;
+      margin: 5px;
+    }
+  }
+}
+.bodytopxj {
+  width: 100%;
+  display: flex;
+  white-space: wrap;
+  align-items: center;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  // align-content: space-between;
+  .bodylist {
+    width: 31%;
+    height: 221px;
+    border: 2px solid #e2e3e5;
+    border-radius: 10px;
+    position: relative;
+    // margin-bottom: 10px;
+    margin: 6px;
+    .texttitle {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      font-weight: 700;
+      margin: 5px 0px 5px 10px;
+    }
+    //
+    .dataliat {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      margin: 0px 0px 5px 10px;
+      font-size: 12px;
+      color: #989992;
+    }
+    .bq {
+      width: 155px;
+    }
+    img {
+      width: 100%;
+      height: 100px;
+    }
+    .label {
+      position: absolute;
+      right: 0px;
+      right: 18px;
+      color: #409eff;
+      bottom: 23px;
+      font-size: 13px;
+    }
+  }
+}
 </style>
diff --git a/src/views/manage/script/index.vue b/src/views/manage/script/index.vue
index 383327f..5349fba 100644
--- a/src/views/manage/script/index.vue
+++ b/src/views/manage/script/index.vue
@@ -209,20 +209,31 @@
             </template>
           </el-table-column>
         </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
     <!-- 添加或修改话术信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body v-if="open">
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="700px"
+      append-to-body
+      v-if="open"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="110px"
+        :inline="true"
+      >
         <el-form-item label="通用话术名称" prop="commonScriptName">
           <el-input
             maxlength="100"
@@ -238,8 +249,13 @@
           />
         </el-form-item>
         <el-form-item label="话术排序" prop="scriptSort">
-          <el-input-number v-model="form.scriptSort" controls-position="right" :min="0" placeholder="请输入话术排序"   style="width:206px"/>
-
+          <el-input-number
+            v-model="form.scriptSort"
+            controls-position="right"
+            :min="0"
+            placeholder="请输入话术排序"
+            style="width: 206px"
+          />
         </el-form-item>
         <el-form-item label="话术ID" prop="scriptId">
           <el-input
@@ -271,7 +287,6 @@
           </el-select>
         </el-form-item>
 
-
         <el-form-item label="科室名称" prop="departmentId">
           <el-button
             type=""
@@ -554,8 +569,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
-        diseaseTypeName:null,
-        departmentId:null,
+        diseaseTypeName: null,
+        departmentId: null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -690,7 +705,7 @@ export default {
       },
       // 表单校验
       rules: {
-        scriptSort:[
+        scriptSort: [
           { required: true, message: "话术排序不能为空", trigger: "blur" }
         ],
         commonScriptName: [
@@ -890,13 +905,13 @@ export default {
       this.form = {
         id: null,
         departmentId: null,
-        scriptSort:undefined,
+        scriptSort: undefined,
         departmentName: null,
         diseaseTypeId: null,
         diseaseTypeName: null,
         diseaseTypeCode: null,
         commonScriptName: null,
-        scriptFilePath:null,
+        scriptFilePath: null,
         scriptName: null,
         scriptId: null,
         platformId: null,
@@ -982,8 +997,8 @@ export default {
         this.form = response.data;
         this.diseaseTypeName = response.data.diseaseTypeName
         this.departmentName = response.data.departmentName
-        if(!this.form.scriptSort){
-          this.form.scriptSort=undefined
+        if (!this.form.scriptSort) {
+          this.form.scriptSort = undefined
         }
         this.open = true;
         this.title = "修改话术信息";
@@ -1048,10 +1063,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .el-input-number .el-input__inner{
+::v-deep .el-input-number .el-input__inner {
   text-align: left;
 }
-::v-deep .el-textarea__inner{
+::v-deep .el-textarea__inner {
   width: 206px;
 }
 .leftscript {
diff --git a/src/views/manage/servicepackage/index.vue b/src/views/manage/servicepackage/index.vue
index 9720ddf..caafa31 100644
--- a/src/views/manage/servicepackage/index.vue
+++ b/src/views/manage/servicepackage/index.vue
@@ -205,6 +205,7 @@
             prop="diseaseTypeName"
           />
           <el-table-column
+          width="180"
             label="操作"
             align="center"
             class-name="small-padding fixed-width"
@@ -251,17 +252,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
     <!-- 添加或修改服务包基础信息对话框 -->
     <el-dialog
       :title="title"
@@ -1409,10 +1409,10 @@ export default {
       // return
       this.$refs["form"].validate(valid => {
         if (valid) {
-            if (this.form.id != null) {
-              this.form.departmentName = this.departmentName
-              this.form.diseaseTypeName = this.diseaseTypeName
-              if (this.form.voList) {
+          if (this.form.id != null) {
+            this.form.departmentName = this.departmentName
+            this.form.diseaseTypeName = this.diseaseTypeName
+            if (this.form.voList) {
               var obj = JSON.parse(JSON.stringify(this.form))
               obj.voList.forEach(e => {
                 if (e.serviceFrequencyText.includes('~')) {
@@ -1431,21 +1431,21 @@ export default {
                 this.getList();
               });
             }
+          } else {
+
+            if (this.diseaseTypeName == "请选择病种") {
+              this.form.diseaseTypeName == null
             } else {
+              this.form.diseaseTypeName = this.diseaseTypeName
+            }
+            if (this.itemname) {
+              this.form.departmentName = this.departmentName
+              this.form.departmentId = this.itemname
 
-              if (this.diseaseTypeName == "请选择病种") {
-                this.form.diseaseTypeName == null
-              } else {
-                this.form.diseaseTypeName = this.diseaseTypeName
-              }
-              if (this.itemname) {
-                this.form.departmentName = this.departmentName
-                this.form.departmentId = this.itemname
-
-              } else {
-                this.form.departmentName = this.departmentName
-              }
-              if (this.form.voList) {
+            } else {
+              this.form.departmentName = this.departmentName
+            }
+            if (this.form.voList) {
               var obj = JSON.parse(JSON.stringify(this.form))
               obj.voList.forEach(e => {
                 if (e.serviceFrequencyText.includes('~')) {
@@ -1495,7 +1495,7 @@ export default {
   width: 204px !important;
 }
 .leftserv {
-  height: 1000px;
+  height: 857px;
   overflow: auto;
   .name {
     font-weight: 700;
diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue
index 6ec0cb4..661ae0e 100644
--- a/src/views/manage/visitin/index.vue
+++ b/src/views/manage/visitin/index.vue
@@ -14,8 +14,8 @@
           style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item> -->
-      <el-form-item label="入院时间" prop="admissionDateStart">
-        <el-date-picker v-model="admissionDate" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
+      <el-form-item label="入院时间" prop="admissionTimeStart">
+        <el-date-picker v-model="admissionTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <!-- <el-form-item label="就诊时间" prop="visitTime">
@@ -163,7 +163,7 @@
           <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
         </template>
       </el-table-column>
-      <el-table-column label="入院时间" align="center" prop="admissionDate" width='130' />-->
+      <el-table-column label="入院时间" align="center" prop="admissionTime" width='130' />-->
       <el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
       <el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
       <el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
@@ -277,9 +277,9 @@
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="form.visitSerialNumber" 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-form-item label="入院时间" prop="admissionTime">
+          <el-date-picker clearable v-model="form.admissionTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+            format='yyyy-MM-dd HH:mm' style="width:200px" placeholder="请选择入院时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="手术名称" prop="surgicalName">
@@ -289,7 +289,7 @@
           <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" />
+          <editor v-model="form.inHospitalInfo" :min-height="192" />
         </el-form-item>
         <!-- <el-form-item label="患者来源" prop="patientSource">
           <el-select v-model="form.patientSource" placeholder="请选择患者来源" clearable style="width:200px">
@@ -333,8 +333,8 @@
             style="width:200px">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="出院时间" prop="dischargeDate">
-          <el-date-picker clearable v-model="form.dischargeDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
+        <el-form-item label="出院时间" prop="dischargeTime">
+          <el-date-picker clearable v-model="form.dischargeTime" type="date" value-format="yyyy-MM-dd" style="width:200px"
             placeholder="请选择出院时间">
           </el-date-picker>
         </el-form-item>
@@ -438,13 +438,13 @@ export default {
       open: false,
       uploadopen: false,
       // 查询参数
-      admissionDate: [],
+      admissionTime: [],
       queryParams: {
         attendingPhysicianId: '',
         pageNum: 1,
         pageSize: 10,
-        admissionDateStart: '',
-        admissionDateEnd: '',
+        admissionTimeStart: '',
+        admissionTimeEnd: '',
         patientName: null,
         patientPhone: null,
         birthDate: null,
@@ -462,7 +462,7 @@ export default {
         wardName: null,
         surgicalName: null,
         surgicalRecord: null,
-        admissionDate: null,
+        admissionTime: null,
         outpatientNumber: null,
         visitTime: null,
         dischargeMethod: null,
@@ -503,7 +503,7 @@ export default {
         visitMethod: [
           { required: true, message: '请输入就诊方式', trigger: 'change' }
         ],
-        admissionDate: [
+        admissionTime: [
           { required: true, message: '请选择患者入院时间', trigger: 'change' }
         ],
       },
@@ -587,9 +587,9 @@ export default {
         visitSerialNumber: null,
         surgicalRecord: null,
         surgicalName: null,
-        admissionDate: null,
-        dischargeDate: null,
-        medicalRecordContent: null,
+        admissionTime: null,
+        dischargeTime: null,
+        inHospitalInfo: null,
         appointmentTreatmentGroup: null,
         registrationNo: null,
         registrationDate: null,
@@ -607,18 +607,18 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      if (this.admissionDate.length > 0) {
-        this.queryParams.admissionDateStart = this.admissionDate[0]
-        this.queryParams.admissionDateEnd = this.admissionDate[1]
+      if (this.admissionTime.length > 0) {
+        this.queryParams.admissionTimeStart = this.admissionTime[0]
+        this.queryParams.admissionTimeEnd = this.admissionTime[1]
       }
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.admissionDate = []
-      this.queryParams.admissionDateStart = ''
-      this.queryParams.admissionDateEnd = ''
+      this.admissionTime = []
+      this.queryParams.admissionTimeStart = ''
+      this.queryParams.admissionTimeEnd = ''
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index 3b56517..fe14f6a 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -9,18 +9,13 @@
         <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
           style="width:200px" />
       </el-form-item>
-      <el-form-item label="门诊/出院时间" prop="dischargeDateStart" label-width="120px">
-        <el-date-picker v-model="dischargeDate" type="daterange" range-separator="至" start-placeholder="开始日期"
+      <el-form-item label="门诊/出院时间" prop="dischargeTimeStart" label-width="120px">
+        <el-date-picker v-model="dischargeTime" type="daterange" range-separator="至" start-placeholder="开始日期"
           style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <!-- <el-form-item label="就诊时间" prop="visitTime">
-        <el-date-picker v-model="queryParams.visitTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
-          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="入院时间" prop="admissionDate">
-        <el-date-picker v-model="queryParams.admissionDate" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
+      <!-- <el-form-item label="入院时间" prop="admissionTime">
+        <el-date-picker v-model="queryParams.admissionTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item> -->
       <!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
@@ -158,7 +153,7 @@
           <span>{{ parseTime(scope.row.visitTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="入院时间" align="center" prop="admissionDate" width='130' /> -->
+      <el-table-column label="入院时间" align="center" prop="admissionTime" width='130' /> -->
       <el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
       <el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
       <el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
@@ -172,9 +167,9 @@
           <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
         </template>
       </el-table-column>
-      <el-table-column label="门诊/出院时间" align="center" prop="dischargeDate" width='130'>
+      <el-table-column label="门诊/出院时间" align="center" prop="dischargeTime" width='130'>
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.dischargeDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.dischargeTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="患者来源" align="center" prop="patientSource">
@@ -285,19 +280,19 @@
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="form.visitSerialNumber" 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">
+        <el-form-item label="门诊时间" prop="dischargeTime" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
+          <el-date-picker clearable v-model="form.dischargeTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+            format='yyyy-MM-dd HH:mm' placeholder="请选择门诊时间" style="width:200px">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="入院时间" prop="admissionDate" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
-          <el-date-picker clearable v-model="form.admissionDate" type="date" value-format="yyyy-MM-dd"
-            style="width:200px" placeholder="请选择入院时间">
+        <el-form-item label="入院时间" prop="admissionTime" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+          <el-date-picker clearable v-model="form.admissionTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+            format='yyyy-MM-dd HH:mm' 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 clearable v-model="form.dischargeTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+            format='yyyy-MM-dd HH:mm' :picker-options="pickerOptions" style="width:200px" placeholder="请选择出院时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="手术名称" prop="surgicalName">
@@ -307,7 +302,7 @@
           <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" />
+          <editor v-model="form.outHospitalInfo" :min-height="192" />
         </el-form-item>
         <!-- <el-form-item label="患者来源" prop="patientSource">
           <el-select v-model="form.patientSource" placeholder="请选择患者来源" clearable style="width:200px">
@@ -351,8 +346,8 @@
             style="width:200px">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="出院时间" prop="dischargeDate">
-          <el-date-picker clearable v-model="form.dischargeDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
+        <el-form-item label="出院时间" prop="dischargeTime">
+          <el-date-picker clearable v-model="form.dischargeTime" type="date" value-format="yyyy-MM-dd" style="width:200px"
             placeholder="请选择出院时间">
           </el-date-picker>
         </el-form-item>
@@ -453,8 +448,8 @@ export default {
     return {
       pickerOptions: {
         disabledDate: (time) => {
-          if (this.form.admissionDate != "") {
-            return time.getTime() < new Date(this.form.admissionDate).getTime();
+          if (this.form.admissionTime != "") {
+            return time.getTime() < new Date(this.form.admissionTime).getTime();
           }
         },
       },
@@ -503,12 +498,12 @@ export default {
       uploadopen: false,
       uploadopentwo: false,
       // 查询参数
-      dischargeDate: [],
+      dischargeTime: [],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        dischargeDateStart: '',
-        dischargeDateEnd: '',
+        dischargeTimeStart: '',
+        dischargeTimeEnd: '',
         patientName: null,
         patientPhone: null,
         birthDate: null,
@@ -526,10 +521,9 @@ export default {
         wardName: null,
         surgicalName: null,
         surgicalRecord: null,
-        admissionDate: null,
+        admissionTime: null,
         dischargeTime: null,
         outpatientNumber: null,
-        visitTime: null,
         dischargeMethod: null,
         patientSource: null,
       },
@@ -568,15 +562,12 @@ export default {
         visitMethod: [
           { required: true, message: '请输入就诊方式', trigger: 'change' }
         ],
-        admissionDate: [
+        admissionTime: [
           { required: true, message: '请选择患者入院时间', trigger: 'change' }
         ],
         dischargeTime: [
           { required: true, message: '请选择患者出院时间', trigger: 'change' }
         ],
-        visitTime: [
-          { required: true, message: '请选择患者就诊时间', trigger: 'change' }
-        ],
         billingDoctorId: [
           { required: true, message: '请选择开单医生', trigger: 'change' }
         ],
@@ -704,16 +695,15 @@ export default {
         visitSerialNumber: null,
         surgicalName: null,
         surgicalRecord: null,
-        admissionDate: null,
+        admissionTime: null,
         dischargeTime: null,
-        dischargeDate: null,
-        medicalRecordContent: null,
+        dischargeTime: null,
+        outHospitalInfo: null,
         appointmentTreatmentGroup: null,
         registrationNo: null,
         registrationDate: null,
         appointmentDate: null,
         outpatientNumber: null,
-        visitTime: null,
         dischargeMethod: null,
         openId: null,
         unionId: null,
@@ -724,18 +714,18 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      if (this.dischargeDate.length > 0) {
-        this.queryParams.dischargeDateStart = this.dischargeDate[0]
-        this.queryParams.dischargeDateEnd = this.dischargeDate[1]
+      if (this.dischargeTime.length > 0) {
+        this.queryParams.dischargeTimeStart = this.dischargeTime[0]
+        this.queryParams.dischargeTimeEnd = this.dischargeTime[1]
       }
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dischargeDate = []
-      this.queryParams.dischargeDateStart = ''
-      this.queryParams.dischargeDateEnd = ''
+      this.dischargeTime = []
+      this.queryParams.dischargeTimeStart = ''
+      this.queryParams.dischargeTimeEnd = ''
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/src/views/operationInfo/operationInfo/index.vue b/src/views/operationInfo/operationInfo/index.vue
index 6fb307d..8f9ae4b 100644
--- a/src/views/operationInfo/operationInfo/index.vue
+++ b/src/views/operationInfo/operationInfo/index.vue
@@ -132,10 +132,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </el-col>
-    </el-row>
-
-    <pagination
+        <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -143,6 +140,11 @@
       @pagination="getList"
     />
 
+      </el-col>
+    </el-row>
+
+
+
     <!-- 添加或修改手术信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index 5ac6448..e9ee7c9 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -83,7 +83,9 @@
                         </el-form-item>
                     </el-form>
                 </div>
-                <wangeditor style="height:300px;width:100%;" ref="editor" />
+                <div class="bottomform">
+                    <wangeditor style="height:300px;width:100%;" ref="editor" />
+                </div>
             </div>
         </div>
     </div>
@@ -204,8 +206,14 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.bottomform {
+    overflow: scroll;
+    height: 930px;
+}
+
 .topform {
     padding: 15px 0 0 15px;
+    height: 70px;
 
     .form {
         ::v-deep .el-input__inner {
@@ -260,6 +268,8 @@ export default {
         width: 22%;
         background-color: #fff;
         padding: 0 20px 20px;
+        height: 1000px;
+        overflow: scroll;
 
         .timetitle {
             height: 60px;
@@ -278,6 +288,7 @@ export default {
         width: 75%;
         background-color: #fff;
         height: 1000px;
+        overflow: scroll;
     }
 }
 
diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue
index f5fc938..4800cf0 100644
--- a/src/views/system/taskExecuteRecord/index.vue
+++ b/src/views/system/taskExecuteRecord/index.vue
@@ -320,21 +320,21 @@
       <el-table-column
         label="入院时间"
         align="center"
-        prop="admissionDate"
+        prop="admissionTime"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.admissionDate, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.admissionTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column
         label="出院时间"
         align="center"
-        prop="dischargeDate"
+        prop="dischargeTime"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.dischargeDate, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.dischargeTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="就诊方式" align="center" prop="visitMethod">
diff --git a/src/views/system/taskPushRecord/index.vue b/src/views/system/taskPushRecord/index.vue
index 45db27b..215bfca 100644
--- a/src/views/system/taskPushRecord/index.vue
+++ b/src/views/system/taskPushRecord/index.vue
@@ -303,30 +303,36 @@
               prop="patientId"
               v-if="form.taskType == 'TEXT_REMIND'"
             >
+            <el-input
+                type="textarea"
+                disabled
+                v-model="form.textRemindContent"
+                style="width: 635px"
+              />
               <!-- 短信 -->
-              <el-input
+              <!-- <el-input
                 v-if="form.messagePushSign == 1"
                 type="textarea"
                 disabled
                 v-model="form.messagePreview"
                 style="width: 635px"
-              />
+              /> -->
               <!-- 公众号 -->
-              <el-input
+              <!-- <el-input
                 v-if="form.officialPushSign == 1"
                 type="textarea"
                 disabled
                 v-model="form.officialRemindContent"
                 style="width: 635px"
-              />
+              /> -->
               <!-- 小程序 -->
-              <el-input
+              <!-- <el-input
                 v-if="form.appletPushSign == 1"
                 type="textarea"
                 disabled
                 v-model="form.appletRemindContent"
                 style="width: 635px"
-              />
+              /> -->
             </el-form-item>
           </div>
           <!-- 人工随访 -->
diff --git a/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue b/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue
index 18d2b77..bd0d9a9 100644
--- a/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue
+++ b/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue
@@ -75,12 +75,14 @@
                     </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="选择日期时间">
+                            value-format="yyyy-MM-dd HH:mm" format='yyyy-MM-dd HH:mm' :picker-options="pickerOptions"
+                            placeholder="选择日期时间">
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item label="出院时间" prop="dischargeTime">
                         <el-date-picker style="width:300px" v-model="form.dischargeTime" type="datetime"
-                            :picker-options="pickerOptionstwo" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间">
+                            :picker-options="pickerOptionstwo" value-format="yyyy-MM-dd HH:mm" format='yyyy-MM-dd HH:mm'
+                            placeholder="选择日期时间">
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item label="手术记录" prop="surgicalRecord" v-if="form.visitMethod == 'BE_HOSPITALIZED'">
@@ -272,7 +274,7 @@ export default {
             var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
             var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
             // 拼接
-            this.todaytime = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+            this.todaytime = year + "-" + month + "-" + day + " " + hours + ":" + minutes
         },
     }
 };