pacs

src/components/doctorCheck/CheckPicture.vue

@@ -14,7 +14,6 @@
           size="small">保存</el-button>
       </div>
       <el-dropdown v-show="checkPagePriv(pagePriv.privs, '导图')" :disabled="doctorBtnDisabled('btnExpPic')">
-
         <span class="el-dropdown-link" style="color: #222531; font-weight: 700">
           <el-button type="primary" class="btnClass" :disabled="doctorBtnDisabled('btnExpPic')">更多</el-button>
         </span>
@@ -125,7 +124,7 @@
                 :name="seq + ''" :key="seq">
                 <el-input style="width: 100%;" type="textarea" v-model="item.result" placeholder="请输入检查结果"
                   :disabled="doctorBtnDisabled('save')"
-                  :autosize="{ minRows: Math.floor((window.pageHeight - 500) / 24), maxRows: 19 }" />
+                  :autosize="{ minRows: Math.floor((window.pageHeight - 550) / 24), maxRows: 18 }" />
                 <div style="display: flex;justify-content: space-between;">
                   <div></div>
                   <div>
@@ -141,14 +140,36 @@
                 </div>
               </el-tab-pane>
             </el-tabs>
-
-
           </div>
 
           <div style="margin-top: 5px;">
             <span style="color: #232748;">检查结论：</span>
-            <el-input style="width: 100%;border: 1px solid #232748;" type="textarea" v-model="pacsParams.summary"
-              :disabled="doctorBtnDisabled('save')" placeholder="请输入结论" :autosize="{ minRows: 8, maxRows: 8 }" />
+            <el-table row-key="id" :data="doctorCheck.checkSummaryList" size="samll" height="186" width="100%" border>
+              <el-table-column width="30" align="center">
+                <template slot-scope="scope">
+                  <el-tag class="moveSummary" style="height:25px;padding:0 2px;cursor: move;background-color: #EEEEEE;">
+                    <div style="width: 16px;">{{ scope.$index + 1 }}</div>
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="summary" label="小结">
+                <template slot="header">
+                  <div style="display: flex;justify-content:space-between;">
+                    <div>小结</div>
+                    <div></div>
+                  </div>
+                </template>
+                <template slot-scope="scope">
+                  <div style="display: flex;">
+                    <el-input type="textarea" v-model="scope.row.summary" :autosize="{ minRows: 1, maxRows: 100 }"
+                      placeholder="请输入小结">
+                    </el-input>
+                    <el-button type="danger" style="min-width:23px;padding:2px;" icon="el-icon-delete"
+                      @click="delSum(scope.$index)" size="small"></el-button>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
           <div style="display: flex;justify-content: space-between;margin-top: 10px;">
             <div></div>
@@ -327,6 +348,22 @@ export default {
       return srcList
     },
 
+    //删除小结
+    delSum(index) {
+      this.$confirm("此操作将删除该记录, 是否继续?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "否",
+        type: "warning",
+      }).then(() => {
+        this.doctorCheck.checkSummaryList.splice(index, 1);
+      }).catch(err => {
+        if (err == "cancel") {
+          // this.$message.info("已取消删除");
+          console.log('已取消删除')
+        }
+      });
+    },
+
     // 图片文件补全路径
     imageFilePlus(fileName) {
       if (fileName.indexOf('base64') > -1 || fileName.indexOf('http') > -1) {

src/components/doctorCheck/PacsDcmList.vue

@@ -112,20 +112,47 @@
         </div>
         <div style="margin-top: -15px;">
           <span style="color: #232748;">检查结论：</span>
-          <el-input style="width: 98%;border: 1px solid #232748;" type="textarea" v-model="pacsParams.summary"
-            placeholder="请输入结论" size="small" :autosize="{ minRows: 6, maxRows: 6 }" />
+          <el-table row-key="id" :data="doctorCheck.checkSummaryList" size="samll" height="186"
+            width="100%" border>
+            <el-table-column width="30" align="center">
+              <template slot-scope="scope">
+                <el-tag class="moveSummary" style="height:25px;padding:0 2px;cursor: move;background-color: #EEEEEE;">
+                  <div style="width: 16px;">{{ scope.$index + 1 }}</div>
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="summary" label="小结">
+              <template slot="header">
+                <div style="display: flex;justify-content:space-between;">
+                  <div>小结</div>
+                  <div></div>
+                </div>
+              </template>
+              <template slot-scope="scope">
+                <div style="display: flex;">
+                  <el-input type="textarea" v-model="scope.row.summary" :autosize="{ minRows: 1, maxRows: 100 }"
+                    placeholder="请输入小结">
+                  </el-input>
+                  <el-button type="danger" style="min-width:23px;padding:2px;" icon="el-icon-delete"
+                    @click="delSum(scope.$index)" size="small"></el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
         <div style="display: flex;justify-content: space-between;margin-top: 10px;">
-          <div></div>
+          <div>
+            <el-checkbox v-model="autoNext" true-label="Y" false-label="N" size="small">自动下一条</el-checkbox>
+          </div>
           <div>
             <!--
           <el-button type="primary" @click="btnTest" class="commonbutton">测试</el-button>
             -->
-            <el-button type="primary" @click="btnChooseBigtext" size="small" class="commonbutton"
+            <el-button type="primary" @click="btnChooseBigtext" style="width: 90px;" size="small" class="commonbutton"
               :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3'">选择描述</el-button>
-            <el-button type="primary" @click="btnOkBigtext" size="small" class="commonbutton"
+            <el-button type="primary" @click="btnOkBigtext" style="width: 90px;" size="small" class="commonbutton"
               :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3'">保存结果</el-button>
-            <el-checkbox v-model="autoNext" true-label="Y" false-label="N" size="small">自动下一条</el-checkbox>
+            
           </div>
         </div>
       </div>
@@ -230,7 +257,7 @@ export default {
       return moment(new Date(date)).format(forMat);
     },
     tableHeight() {
-      return this.window.pageHeight - 105 - 400 - 76
+      return this.window.pageHeight - 105 - 450 - 76
     },
   },
   methods: {
@@ -407,6 +434,22 @@ export default {
 
     },
     
+    //删除小结
+    delSum(index) {
+      this.$confirm("此操作将删除该记录, 是否继续?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "否",
+        type: "warning",
+      }).then(() => {
+        this.doctorCheck.checkSummaryList.splice(index, 1);
+      }).catch(err => {
+        if (err == "cancel") {
+          // this.$message.info("已取消删除");
+          console.log('已取消删除')
+        }
+      });
+    },
+
     // 浏览Dcm文件
     btnBrowseDcm() {
 
@@ -441,17 +484,23 @@ export default {
     // 确定描述与结论
     btnOkBigtext() {
       // console.log('this.pacsParams', this.pacsParams)
+      /*
       if (!this.pacsParams.summary) {
         this.$message.warning({ showClose: true, message: '请填写检查结论' })
         return
       }
-      //this.doctorCheck.checkItemList[0].result = this.pacsParams.result
+      
       this.doctorCheck.checkSummaryList = [{
         id: Math.random(),
         registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
         summary: this.pacsParams.summary,
         summaryFlag: 'N',
       }]
+      */
+      if (this.doctorCheck.checkSummaryList.length < 1) {
+        this.$message.warning({ showClose: true, message: '请填写检查结论' })
+        return
+      }
 
       this.save()
         .then(() => {

src/components/doctorCheck/PacsTemplate.vue

@@ -27,26 +27,18 @@
         </div>
         <div>
           <el-input style="width: 100%" type="textarea" v-model="doctorCheck.checkItemList[refParams.index].result"
-            placeholder="请输入检查结果" :autosize="{ minRows: 10, maxRows: 10 }" />
+            placeholder="请输入检查结果" :autosize="{ minRows: 9, maxRows: 9 }" />
         </div>
       </div>
       <div style="margin-left: 8px; width: 50%;">
         <div style="display: flex; justify-content: space-between;height: 20px;">
           <div><span>检查结论：</span></div>
           <div>
-            <el-tooltip :content="`给 ${doctorCheck.checkItemList[refParams.index].itemName} 项目，赋默认结果`" placement="top">
-              <i class="el-icon-edit" @click="btnDefResult(refParams.index)"
-                style="font-size: 18px;color: blue;cursor: pointer;margin-right: 10px;"></i>
-            </el-tooltip>
-            <el-tooltip :content="`清除 ${doctorCheck.checkItemList[refParams.index].itemName} 项目的检查结果`" placement="top">
-              <i class="el-icon-delete" @click="btnClear(refParams.index)"
-                style="font-size: 18px; color: red;cursor: pointer;margin-right: 10px;"></i>
-            </el-tooltip>
           </div>
         </div>
 
         <div>
-          <el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" size="samll" height="186"
+          <el-table row-key="id" :data="doctorCheck.checkSummaryList" size="samll" height="186"
             width="100%" border>
             <el-table-column width="30" align="center">
               <template slot-scope="scope">

src/components/webBooking/WebBooking.vue

@@ -301,10 +301,23 @@ export default {
       console.log('this.query', this.query)
     },
 
-    rowClick(row) {
+    async rowClick(row) {
       // chargeFlag	string  收费状态 0-未收费 1-已收费 2-已退费
-      this.currRowData = row
+      this.currRowData = Object.assign({},row)
       this.tableDataDetails = []
+
+      let sysParmId = "small_program_individual_appointment_mandatory_fee"
+      let sysParam = await postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId })
+      // 要求强制收费
+      if (sysParam.data == '1'){
+        if(row.chargeFlag != '1'){
+          this.$message.warning({ showClose: true, message: "该预约未缴费，不可进行登记" })
+          this.currRowData = {}
+          return
+        }
+      }
+
+
       postapi('/api/app/AppointPatientRegister/GetAppointRegisterAsbitemListById', {
         thirdInterFaceId: this.query.thirdInterfaceId,
         appointPatientRegisterId: row.appointPatientRegisterId