Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

public/index.html

@@ -39,8 +39,8 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
       //http://121.36.16.195:9002/huimu-admin/swagger-ui/index.html
-    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
     </script>
   <% } %>
   <!-- 测试环境 -->

src/page-subspecialty/views/modules/formList/InformedConsent.vue

@@ -19,7 +19,14 @@
         <div class="flex a-c item">年龄：<el-input v-model="confirmData.patientAge" style="flex: 1" placeholder="" />岁</div>
         <div class="flex a-c item">性别：<el-input v-model="confirmData.patientGender" style="flex: 1" placeholder="" /></div>
         <div class="flex a-c item">眼别：
-          <el-select v-model="confirmData.eyeType" style="flex: 1" placeholder="">
+          <el-select
+            ref="eyeTypeRef"
+            v-model="confirmData.eyeType"
+            filterable
+            allow-create
+            style="flex: 1"
+            placeholder=""
+          >
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -66,13 +73,12 @@
             <span class="check" @click="item.isSelected = !item.isSelected">
               <input type="checkbox" :checked="item.isSelected">{{ item.name }}
             </span>
-            <!--            <el-checkbox v-model="item.isSelected" class="checkboxItem">{{ item.name }}</el-checkbox>-->
             <span v-if="item.area" class="flex">(
-              <span v-for="(area,index) in item.area" :key="`${index}_${i}`" class="areaItem">
+              <span v-for="(area,index) in item.area" :key="`${index}_${i}`" class="areaItem flex">
                 <span class="check" @click="area.isSelected = !area.isSelected">
                   <input type="checkbox" :checked="area.isSelected">{{ area.name }}
                 </span>
-                <!--                <el-checkbox v-model="area.isSelected" class="checkboxItem">{{ area.name }}</el-checkbox>-->
+                <span v-if="area.name==='全'" style="margin-left: 5px" class="flex">第 <el-input v-model="confirmData.frequency" style="width: 50px" /> 次</span>
               </span>
               )</span>
           </div>
@@ -185,7 +191,8 @@ export default {
         patientSign: '',
         qgy: '',
         ydb: '',
-        swmxgxbb: ''
+        swmxgxbb: '',
+        frequency: ''
       },
       options: [{
         value: 'OD',
@@ -370,14 +377,6 @@ export default {
   },
   created() {
     this.origin = JSON.parse(JSON.stringify(this.confirmData))
-    // 患者信息带入
-    this.confirmData.patientName = this.patientDetail.patientName
-    this.confirmData.patientAge = this.patientDetail.patientAge
-    this.confirmData.patientGender = this.patientDetail.patientSex
-    const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
-    this.confirmData.operationSign = userData.signImgBase
-    this.confirmData.operationDate = this.$moment().format('YYYY-MM-DD HH:mm:ss')
-    this.confirmData.patientDate = this.$moment().format('YYYY-MM-DD HH:mm:ss')
     this.getInfoDetail()
     this.queryProject()
     this.$store.commit('initPlugin')
@@ -392,9 +391,7 @@ export default {
         patientId: this.patientDetail.patientId
       }}).then(data => {
         const detail = data.data.data
-        if (detail.eyeType) {
-          this.confirmData.eyeType = detail.eyeType
-        }
+        this.confirmData.eyeType = detail.eyeType
         const bnzList = detail.bnz && detail.bnz.split('/') || []
         const qgyList = detail.qgy && detail.qgy.split('/') || []
         const ydbList = detail.ydb && detail.ydb.split('/') || []
@@ -405,6 +402,22 @@ export default {
         this.handleDetail(bnzList, qgyList, ydbList, swmList, detail.coats, mzfsList, jgshList, jgshAreaList)
         this.confirmData.other = detail.other || ''
         this.$store.commit('informPatientSign', detail.patientSign)
+        if (!detail.jzNumber) {
+          // 患者信息带入
+          this.confirmData.patientName = this.patientDetail.patientName
+          this.confirmData.patientAge = this.patientDetail.patientAge
+          this.confirmData.patientGender = this.patientDetail.patientSex
+          const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
+          this.confirmData.operationSign = userData.signImgBase
+          this.confirmData.operationDate = this.$moment().format('YYYY-MM-DD')
+          this.confirmData.patientDate = this.$moment().format('YYYY-MM-DD')
+        } else {
+          this.confirmData.patientName = detail.patientName
+          this.confirmData.patientAge = detail.patientAge
+          this.confirmData.patientGender = detail.patientGender
+          this.confirmData.operationDate = detail.operationDate
+          this.confirmData.patientDate = detail.patientDate
+        }
       })
     },
     // 获取详情数据并展示在页面中
@@ -552,6 +565,11 @@ export default {
     },
     // 保存
     handleSaveTable() {
+      if (!this.confirmData.eyeType) {
+        this.$message.error('请选择眼别')
+        this.$refs.eyeTypeRef.focus()
+        return
+      }
       this.handleList()
       this.handleNarcotism()
       this.handleMode()

src/page-subspecialty/views/modules/formList/laserSurgery.vue

@@ -176,9 +176,8 @@
           </tbody>
         </table>
         <div class="descImg" @click="editImg()">
-          <div>示意图</div>
+          <div>示意图 <span>{{ confirmData.eyeType }}</span></div>
           <img v-if="confirmData.jgzlSyt" :src="confirmData.jgzlSyt">
-          <!--          <img v-if="confirmData.jgzlSyt" src="@/assets/img/od.png">-->
         </div>
       </div>
       <div class="flex a-c">
@@ -294,9 +293,9 @@ export default {
   methods: {
     changeEyeType(value) {
       if (value === 'OD') {
-        this.confirmData.jgzlSyt = odOrOs.od
+        this.confirmData.jgzlSyt = require('@/assets/img/od.png')
       } else {
-        this.confirmData.jgzlSyt = odOrOs.os
+        this.confirmData.jgzlSyt = require('@/assets/img/os.png')
       }
     },
     onEnter(index) {
@@ -374,10 +373,11 @@ export default {
           this.confirmData.patientAddress = this.patientDetail.patientAddress
           this.confirmData.patientPhone = this.patientDetail.patientPhone
           this.confirmData.operateDate = new Date()
+          this.confirmData.eyeType = 'OD'
           if (this.confirmData.eyeType === 'OD') {
-            this.confirmData.jgzlSyt = odOrOs.od
+            this.confirmData.jgzlSyt = require('@/assets/img/od.png')
           } else {
-            this.confirmData.jgzlSyt = odOrOs.os
+            this.confirmData.jgzlSyt = require('@/assets/img/os.png')
           }
         }
         const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
@@ -437,12 +437,15 @@ export default {
   margin-bottom: 10px;
 }
 .descImg{
-  font-size: 12px;
+  font-size: 16px;
   padding: 10px;
   flex: 1;
   border: 1px solid #8e8c8c;
   margin-left: 20px;
   height: 280px;
+  span{
+    font-weight: bold;
+  }
   div{
     height: 20px;
     text-align: left;

src/page-subspecialty/views/modules/imgEditorFabric/img-editor/bgBar.vue

@@ -121,11 +121,12 @@ export default {
   margin-bottom: 0;
 }
 .img {
-  width: 360px*0.2;
-  height: 400px*0.2;
+  width: 320px*0.2;
+  height: 320px*0.2;
   padding: 5px;
   margin-left: 5px;
   cursor: pointer;
+  background: #fff;
 }
 
 ::v-deep .el-divider__text{

src/page-subspecialty/views/modules/imgEditorFabric/img-editor/setSize.vue

@@ -38,8 +38,8 @@ export default {
   inject: ['canvas', 'fabric'],
   data() {
     return {
-      width: 360 * 2,
-      height: 400 * 2,
+      width: 320 * 2.5,
+      height: 320 * 2.5,
       presetSize: [{
         label: '红书竖版',
         width: 900,

src/page-subspecialty/views/modules/imgEditorFabric/index.vue

@@ -2,7 +2,7 @@
   <div class="home">
     <div>
       <div v-if="show" class="img_header">
-        <div style="font-size: 20px; font-weight: bold">眼底绘图</div>
+        <div style="font-size: 20px; font-weight: bold">眼底绘图  {{ isOdOrOs }}</div>
         <div>
           <save @fullImgBack="fullImgBack" />
           <el-button size="small" @click="closeDialog">关闭</el-button>

src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue

@@ -19,7 +19,7 @@
         </div>
       </div>
       <el-form-item label="负责医生:">
-        <el-col :span="12">
+        <el-col :span="10">
           <el-select v-model="form.doctorId" placeholder="请选择" @change="selectDoctor">
             <el-option
               v-for="item in doctorList"
@@ -29,19 +29,13 @@
             />
           </el-select>
         </el-col>
-        <el-col :span="13" style="display: flex;align-items: center;margin-left: 15px">
+        <el-col :span="11" style="display: flex;align-items: center">
           <span style="margin-right: 6px;margin-bottom: 3px">患者类型:</span>
           <el-checkbox-group v-model="form.patientType">
             <el-checkbox label="门诊" />
             <el-checkbox label="住院" />
             <el-checkbox label="会诊" />
           </el-checkbox-group>
-          <!--          <div class="radioItem" @click="form.yzOpen='Y'">-->
-          <!--            <input :checked="form.yzOpen==='Y'" type="radio">是-->
-          <!--          </div>-->
-          <!--          <div class="radioItem" @click="form.yzOpen='N'">-->
-          <!--            <input :checked="form.yzOpen==='N'" type="radio">否-->
-          <!--          </div>-->
         </el-col>
       </el-form-item>
       <el-form-item label="备注:">
@@ -98,14 +92,8 @@
             <el-checkbox label="FFA" />
             <el-checkbox label="ICGA" />
             <el-checkbox label="其他" />
-            <el-input v-model="form.otherProject" size="small" placeholder="" style="width: 125px;" />
+            <el-input v-model="form.otherProject" class="otherProject" size="small" placeholder="" style="width: 125px;" />
           </el-checkbox-group>
-          <!--          <div class="radioItem" @click="form.threeMirror='Y'">-->
-          <!--            <input :checked="form.threeMirror==='Y'" type="radio">是-->
-          <!--          </div>-->
-          <!--          <div class="radioItem" @click="form.threeMirror='N'">-->
-          <!--            <input :checked="form.threeMirror==='N'" type="radio">否-->
-          <!--          </div>-->
         </el-col>
       </div>
       <div style="display: flex;padding:0 0 20px 0px">
@@ -118,12 +106,6 @@
             <el-checkbox label="全身检查完成" />
             <el-checkbox label="缩瞳" />
           </el-checkbox-group>
-          <!--          <div class="radioItem" @click="form.threeMirror='Y'">-->
-          <!--            <input :checked="form.threeMirror==='Y'" type="radio">是-->
-          <!--          </div>-->
-          <!--          <div class="radioItem" @click="form.threeMirror='N'">-->
-          <!--            <input :checked="form.threeMirror==='N'" type="radio">否-->
-          <!--          </div>-->
         </el-col>
       </div>
       <el-form-item label="预约时间:" required>
@@ -376,6 +358,13 @@ input{
 ::v-deep .el-checkbox{
   margin-right: 12px;
 }
+.otherProject{
+  ::v-deep .el-input__inner{
+    border: 0;
+    border-radius: 0;
+    border-bottom: 1px solid #ccc !important;
+  }
+}
 .patientDetail{
   border: 1px solid #6EB1FF;
   border-radius:  8px;

src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue

@@ -33,26 +33,6 @@
               :value="item.itemId"
             />
           </el-select>
-          <el-button
-            v-for="(item,index) in typeList"
-            :key="index"
-            :class="[curIndex === index ? 'active' : '']"
-            style="margin-left: 0"
-            size="small"
-            color="white"
-            @click="handleType(item.value, index)"
-          >{{ item.label }}</el-button>
-          <div style="margin-left: 15px">
-            <el-button
-              v-for="(item,index) in optionList"
-              :key="item.label"
-              :class="[curIndex2 === index ? 'active' : '']"
-              style="margin-left: 0"
-              size="small"
-              color="white"
-              @click="changeType(item.value, index)"
-            >{{ item.label }}</el-button>
-          </div>
           <div style="margin-left: 15px">
             预约时间:
             <el-date-picker
@@ -72,6 +52,28 @@
           <el-button v-print="printObj" type="primary" icon="el-icon-edit" size="small" @click="printTable">打印</el-button>
         </div>
       </div>
+      <div style="display: flex;margin: 15px 0 0 15px">
+        <el-button
+          v-for="(item,index) in typeList"
+          :key="index"
+          :class="[curIndex === index ? 'active' : '']"
+          style="margin-left: 0"
+          size="small"
+          color="white"
+          @click="handleType(item.value, index)"
+        >{{ item.label }}</el-button>
+        <div style="margin-left: 15px">
+          <el-button
+            v-for="(item,index) in optionList"
+            :key="item.label"
+            :class="[curIndex2 === index ? 'active' : '']"
+            style="margin-left: 0"
+            size="small"
+            color="white"
+            @click="changeType(item.value, index)"
+          >{{ item.label }}</el-button>
+        </div>
+      </div>
       <div class="scheduled-patient-content">
         <el-table
           id="multipleTable"
@@ -88,6 +90,7 @@
               {{ scope.row.appointDate ? scope.row.appointDate : '-' }}
             </template>
           </el-table-column>
+          <el-table-column label="类型" header-align="center" align="center" width="55px" />
           <el-table-column label="负责医生" header-align="center" align="center" width="100px">
             <template slot-scope="scope">
               {{ scope.row.doctorName ? scope.row.doctorName : '-' }}
@@ -95,9 +98,9 @@
           </el-table-column>
           <el-table-column prop="patientName" label="患者姓名" header-align="center" align="center" width="100px" />
           <el-table-column prop="patientId" label="登记号" header-align="center" align="center" width="120px" />
-          <el-table-column prop="patientPhone" label="电话号" header-align="center" align="center" width="140px" />
-          <el-table-column label="医疗项目" prop="itemName" header-align="center" align="center" width="100px" />
+          <el-table-column prop="patientPhone" label="电话" header-align="center" align="center" width="140px" />
           <el-table-column label="眼别" prop="eyeType" header-align="center" align="center" width="80px" />
+          <el-table-column label="医疗项目" prop="itemName" header-align="center" align="center" width="100px" />
           <el-table-column label="准备工作" header-align="center" align="center" width="140px">
             <template slot-scope="scope">
               <div>

src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue

@@ -86,7 +86,6 @@
           style="width: 100%"
         >
           <el-table-column prop="patientId" label="登记号" header-align="center" align="center" width="120" />
-          <!--          <el-table-column prop="patientId" label="就诊号" header-align="center" align="center" />-->
           <el-table-column label="状态" header-align="center" align="center" width="70">
             <template slot-scope="scope">
               {{ scope.row.patientStatus | patientStatus }}
@@ -100,7 +99,7 @@
           </el-table-column>
           <el-table-column prop="zlEye" label="眼别" header-align="center" align="center" width="100">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.zlEye" placeholder="" size="small" @change="value=>changeEyeType(value,scope)">
+              <el-select v-model="scope.row.zlEye" class="eyeType" placeholder="" size="small" @change="value=>changeEyeType(value,scope)">
                 <el-option
                   v-for="item in eyeList"
                   :key="item.value"
@@ -130,17 +129,23 @@
           <!--              {{ scope.row.callStatus | callStatus }}-->
           <!--            </template>-->
           <!--          </el-table-column>-->
-          <el-table-column prop="operation" label="操作" header-align="center" align="center" width="180">
+          <el-table-column prop="operation" label="操作" header-align="center" align="center" width="210">
             <template slot-scope="scope">
               <span
                 style="color: #1890ff; padding-right: 8px"
                 class="operation-details"
                 @click="showDetail(scope.row, 1)"
               >开始</span>
+              <span
+                v-if="scope.row.registerType==='1'"
+                style="color: #ff0000; padding-right: 8px"
+                class="operation-details"
+                @click="deleteTreat(scope.row)"
+              >删除</span>
               <span
                 style="color: #1890ff; padding-right: 8px"
                 class="operation-details"
-                @click="finishTreat(scope.row, 1)"
+                @click="finishTreat(scope.row)"
               >结束</span>
               <span
                 style="color: #1890ff; padding-right: 8px"
@@ -394,6 +399,18 @@ export default {
       window.sessionStorage.setItem('mzDoctorName', mzName)
       window.sessionStorage.setItem('jzNumber', jzNumber)
     },
+    deleteTreat(scopeRow) {
+      this.$confirmFun('你确定要删除吗？').then(() => {
+        this.$http.get('/patient/delRepeatPatientType', { params: {
+          jzNumber: scopeRow.jzNumber,
+          patientId: scopeRow.patientId,
+          type: '2'
+        }}).then(res => {
+          this.$message.success(res.data.data)
+          this.getDataListInitial()
+        })
+      })
+    },
     // His引入
     HISHandle() {
       this.HisAddVisible = true
@@ -433,6 +450,11 @@ export default {
     border-color: #3ea3f6;
   }
 }
+.eyeType{
+  ::v-deep .el-input__inner{
+    font-size: 16px !important;
+  }
+}
 </style>
 <style lang="scss">
 .patient-info {