Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/patient.js

@@ -276,13 +276,11 @@ export function code(id) {
   })
 }
 
-export function GetCoursePrintData(id) {
+export function GetCoursePrintData(params) {
   return request({
     url: '/api/print/course',
     method: 'Get',
-    params: {
-      id: id
-    }
+    params: params
   })
 }
 
@@ -552,11 +550,11 @@ export function deleteSummary(params) {
   })
 }
 
-export function createHospitalSummary(params) {
+export function createHospitalSummary(data) {
   return request({
     url: '/api/patient/hospitalsummary',
-    method: 'get',
-    params: params
+    method: 'post',
+    data: data
   })
 }
 
@@ -576,11 +574,11 @@ export function getHospitalSummaryDetail(id, params) {
   })
 }
 
-export function updateHospitalSummary(params) {
+export function updateHospitalSummary(data) {
   return request({
     url: '/api/patient/updatehospitalsummary',
-    method: 'get',
-    params: params
+    method: 'post',
+    data: data
   })
 }
 

src/api/schedule.js

@@ -229,3 +229,11 @@ export function getNextWeekPanels(params) {
     params: params
   })
 }
+
+export function synchroSchedule(params) {
+  return request({
+    url: '/api/schedule/synchroschedule',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1694,7 +1694,7 @@
 
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
-
+                 ParamsQuery['patient_id'] = this.$route.query.patient_id
                 if (this.prescription.creater <= 0) {
                   ParamsQuery['mode'] = '1'
                 } else {
@@ -2203,6 +2203,7 @@
               const ParamsQuery = arr
               // console.log('night', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
+             
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
               ParamsQuery['patient_id'] = this.patient.id

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -512,7 +512,7 @@
             align="center"
             label="KT/V"
             width="140"
-            v-if="isShow('KT/V') && org_id == 9987"
+            v-if="isShow('KT/V') && (org_id == 9987 || org_id ==10215 || org_id == 9800) "
           >
            <template slot-scope="scope">
               {{ scope.row.ktv ? scope.row.ktv : ""  }}

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -38,7 +38,7 @@
           <th v-if="isShow('血压监测')" width="92px">血压监测</th>
           <!-- <th v-if="isShow('血压监测部位')" width="92px">血压监测部位</th>
           <th v-if="isShow('并发症')" width="92px">并发症</th> -->
-          <th v-if="isShow('KT/V') && org_id == 9987" width="92px">KT/V</th>
+          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)" width="92px">KT/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -85,7 +85,7 @@
           <th v-if="isShow('尿素监测')" width="92px">{{monitor.urea_monitoring ? monitor.urea_monitoring : ""}}</th>
           <th v-if="isShow('血浓量')" width="92px">{{monitor.blood_thickness ? monitor.blood_thickness : ""}}</th>
           <th v-if="isShow('血压监测')" width="92px">{{monitor.blood_monitor ? monitor.blood_monitor : ""}}</th>
-          <td v-if="isShow('KT/V') && org_id == 9987">{{ monitor.ktv?monitor.ktv:""}}</td>
+          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>
           <td v-if="isShow('结果')">{{ monitor.result }}</td>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

@@ -6,37 +6,39 @@
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
           <tr>
-            <td width="50">姓 名:</td>
-            <td width="90">
+            <td width="40">姓名:</td>
+            <td width="80">
               <div class="under-line">&nbsp;{{ patientInfo.name }}</div>
             </td>
-            <td width="20"></td>
-            <td width="50">性 别:</td>
-            <td width="100">
+            <td width="10"></td>
+            <td width="40">性别:</td>
+            <td width="80">
               <div>
                 <label-box :isChecked="patientInfo_gender_1" showValue="男"></label-box>
                 <label-box :isChecked="patientInfo_gender_2" showValue="女"></label-box>
               </div>
             </td>
 
-            <td width="50">年 龄:</td>
+            <td width="40">年龄:</td>
             <td width="40">
               <div class="under-line">{{ getAge(patientInfo) }}</div>
             </td>
             <td>岁</td>
             <td width="10"></td>
-
+            <td width="60">病例号:</td>
+            <td width="50">
+              <div class="under-line">{{ patientInfo.dialysis_no }}</div>
+            </td>
+            <td width="10"></td>
             <td width="70">透析机号:</td>
             <td width="100">
               <div class="under-line">{{ getNumber() }}</div>
             </td>
-            <td width="30"></td>
             <td>
                 日期：<div class="under_line" style="width:50px;display: inline-block;text-align:center;">{{ queryParams.xtdate.slice(0,4) }}</div>年
                 <div class="under_line" style="width:50px;display: inline-block;text-align:center;">{{ queryParams.xtdate.slice(5,7) }}</div>月
                 <div class="under_line" style="width:50px;display: inline-block;text-align:center;">{{ queryParams.xtdate.slice(8,11) }}</div>日
             </td>
-            <td width='10'></td>
           </tr>
         </tbody>
       </table>
@@ -161,9 +163,9 @@
                     <td width='100'>动脉穿刺方向：</td>
                     <td width="120">
                       <div>
-                        <label-box :isChecked="predialysis.puncture_way.indexOf('顺穿') > -1 ? true : false" showValue="顺穿"></label-box>
+                        <label-box :isChecked="predialysis.puncture_way ? predialysis.puncture_way.indexOf('顺穿') > -1 ? true : false : false" showValue="顺穿"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.puncture_way.indexOf('反穿') > -1 ? true : false" showValue="反穿"></label-box>
+                        <label-box :isChecked="predialysis.puncture_way ? predialysis.puncture_way.indexOf('反穿') > -1 ? true : false : false" showValue="反穿"></label-box>
                         &nbsp;
                       </div>
                     </td>
@@ -174,7 +176,35 @@
               <table class="table-box">
                 <tbody>
                   <tr>
-                    <td width="80"></td>
+                    <td width="80"><span style="font-weight:bold;">内瘘震颤</span></td>
+                    <td width="160">
+                      <div>
+                        <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-存在') > -1 ? true : false" showValue="存在"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-无') > -1 ? true : false" showValue="无"></label-box>
+                      </div>
+                    </td>
+                    <td width='30'></td>
+                    <td width='100'>穿刺针型号：</td>
+                    <td>
+                      <div class="under-line" style="text-align:left;">{{ predialysis.puncture_needle ? predialysis.puncture_needle : '/' }}</div>
+                      <!-- <div>
+                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-静脉') > -1 ? true : false" showValue="16G"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-静脉') > -1 ? true : false" showValue="17G"></label-box>
+                        &nbsp;
+                      </div> -->
+                    </td>
+                    <td></td>
+                  </tr>
+                </tbody>
+              </table>
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="10"></td>
                     <td width="85">
                       <div>
                         <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('静脉置管-临时') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('静脉置管-长期') > -1 ? true : false" showValue="静脉置管"></label-box>
@@ -222,18 +252,6 @@
               <table class="table-box">
                 <tbody>
                   <tr>
-                    <td width="80"></td>
-                    <td width="70">内瘘震颤:</td>
-                    <td width="160">
-                      <div>
-                        <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-存在') > -1 ? true : false" showValue="存在"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-无') > -1 ? true : false" showValue="无"></label-box>
-                      </div>
-                    </td>
-                    <td width='30'></td>
                     <td width='50'>导管：</td>
                     <td width='60'>管腔外露</td>
                     <td width="60">
@@ -263,34 +281,6 @@
                   </tr>
                 </tbody>
               </table>
-              <table class="table-box">
-                <tbody>
-                  <tr>
-                    <!-- <td width="190"></td> -->
-                    <td width='100'>穿刺针型号：</td>
-                    <td>
-                      <div class="under-line" style="text-align:left;">{{ predialysis.puncture_needle ? predialysis.puncture_needle : '/' }}</div>
-                      <!-- <div>
-                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-静脉') > -1 ? true : false" showValue="16G"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-静脉') > -1 ? true : false" showValue="17G"></label-box>
-                        &nbsp;
-                      </div> -->
-                    </td>
-                    <!-- <td width='80'>钝针穿刺：</td>
-                    <td width="140">
-                      <div>
-                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-动脉') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-动脉') > -1 ? true : false" showValue="动脉"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G-静脉') > -1 ? true : predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G-静脉') > -1 ? true : false" showValue="静脉"></label-box>
-                        &nbsp;)
-                      </div>
-                    </td> -->
-                    <td></td>
-                  </tr>
-                </tbody>
-              </table>
-
               <table class="table-box">
                 <tbody>
                   <tr>
@@ -560,7 +550,7 @@
           <tr>
             <td width="70" style="height:40px;">主管医生:</td>
             <td width="100">
-                <div style="text-align: left;">
+                <div style="text-align: left;display: flex;align-items: center;">
                     <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
                     <img class="es-img" style="height:38px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
                 </div>
@@ -568,7 +558,7 @@
             <td width="70">预冲护士:</td>
             <td width="100">
 
-                <div style="text-align: left;">
+                <div style="text-align: left;display: flex;align-items: center;">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
                     <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
                 </div>
@@ -576,7 +566,7 @@
             <td width="100">穿刺/开管护士:</td>
             <td width="100">
 
-                <div style="text-align: left;">
+                <div style="text-align: left;display: flex;align-items: center;">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
                     <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
                 </div>
@@ -584,7 +574,7 @@
             <td width="70">核对护士:</td>
             <td width="100">
 
-                <div style="text-align: left;">
+                <div style="text-align: left;display: flex;align-items: center;">
                   <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                   {{ getAdminUser(check == null ? 0 : check.modifier) }}
                   </span>
@@ -623,6 +613,7 @@
             <td width="60">电导度<br/>ms/cm</td>
             <td width="40">液温<br/>℃</td>
             <td width="40">血糖<br/>mmol/L</td>
+            <td width="40">ktv</td>
             <td>执行护士</td>
           </tr>
 
@@ -671,8 +662,11 @@
             <td>
               &nbsp;{{ monitor.blood_sugar ? monitor.blood_sugar : "" }}
             </td>
+            <td>
+              &nbsp;{{ monitor.ktv ? monitor.ktv : "" }}
+            </td>
             <td style="text-align:left;padding-left:5px;">
-                <span>
+                <span style="display:flex;align-items:center;">
                     <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">{{ getAdminUser(monitor.monitoring_nurse) }}</span>
                     <img class="es-img" style="height:38px" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset v-else />
                 </span>
@@ -724,7 +718,7 @@
                     <td width="50">kt/v:</td>
                     <td width='120'>
                         <div class="under-line">
-                          &nbsp;
+                          &nbsp;{{ monitorsKtv ? monitorsKtv : '' }}
                         </div>
                     </td>
                     <td></td>
@@ -822,10 +816,10 @@
                                 <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('常规（肝素/NS）')>-1?true:false" showValue="常规（肝素/NS）"></label-box>&nbsp;
                             </td>
                             <td width="50">
-                                <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('1:1')>-1?true:false" showValue="1:1"></label-box>&nbsp;
+                                <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('1:1')>-1?true:afterdialysis.sealing_fluid_dispose.indexOf('1：1')>-1?true:false" showValue="1:1"></label-box>&nbsp;
                             </td>
                             <td width="50">
-                                <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('1:3')>-1?true:false" showValue="1:3"></label-box>&nbsp;
+                                <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('1:3')>-1?true:afterdialysis.sealing_fluid_dispose.indexOf('1：3')>-1?true:false" showValue="1:3"></label-box>&nbsp;
                             </td>
                             <td width="190">
                                 <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('特殊（尿激酶/肝素/NS）')>-1?true:false" showValue="特殊（尿激酶/肝素/NS）"></label-box>&nbsp;
@@ -922,6 +916,10 @@
                     <td width="90" style="height:40px;">当班责任护士:</td>
                     <td width="100">
                       <div>
+                        <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+                        {{ getAdminUser(check == null ? 0 : check.modifier) }}
+                        </span>
+                        <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
                       </div>
                     </td>
                     <td width="150"></td>
@@ -953,40 +951,35 @@
           <td width='80'>护士签名</td>
         </tr>
         <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index" >
-          <td style="height:40px;line-height:40px">{{ getTime(advice.start_time, "{h}:{i}") }}</td>
+          <td style="height:40px;line-height:40px;padding:0 1px !important;">{{ getTime(advice.start_time, "{h}:{i}") }}</td>
           <td class="parent" style="text-align:left;padding-left:10px;">
             <div style="display:flex;height:100%;">
-              <span style="width:70%;display:inline-block;">
-                <span v-if="advice.parent_id > 0">/</span>
+              <span style="width:65%;display:inline-block;">
+                <span v-if="advice.parent_id > 0">---></span>
                 <span>{{ advice.advice_name }}</span>
                 <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
                 <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
                 <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
-                
                 <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
                 <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
               </span>
-              <span v-if="advice.parent_id == 0" style="display: flex;align-items: baseline;"><span v-if="advice.delivery_way != ''" style="transform:rotate(30deg);border-left:1px solid #000;display:inline-block;height:100%;"></span>{{ advice.delivery_way }}</span>
+              <span style="display: flex;align-items: baseline;">
+                {{ advice.delivery_way }}
+              </span>
             </div>
           </td>
-          <td>
-            <span v-if="setAdminUserES(advice.advice_doctor) == ''">
+          <td style="text-align:left;">
+            <span>
               {{ getAdminUser(advice.advice_doctor) }}
             </span>
-            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-              <img style="height:38px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
-            </span>
           </td>
           
           
           <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-          <td>
-            <span v-if="setAdminUserES(advice.execution_staff) == ''">
+          <td style="text-align:left;">
+            <span>
               {{ getAdminUser(advice.execution_staff) }}
             </span>
-            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-              <img style="height:38px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
-            </span>
           </td>
         </tr>
         <tr v-for="(advice, advice_index) in projects" :key="advice_index + 'no'">
@@ -999,8 +992,8 @@
             <span v-if="setAdminUserES(advice.doctor) == ''">
               {{ getAdminUser(advice.doctor) }}
             </span>
-            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-              <img style="height:38px;" :src="setAdminUserES(advice.doctor)" alt srcset />
+            <span v-else style="display:flex;align-items:center;justify-content:space-between;height:36px;padding-left:5px;">
+              <img style="height:20px;" :src="setAdminUserES(advice.doctor)" alt srcset />
             </span>
           </td>
           
@@ -1010,8 +1003,8 @@
             <span v-if="setAdminUserES(advice.execution_staff) == ''">
               {{ getAdminUser(advice.execution_staff) }}
             </span>
-            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-              <img style="height:38px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
+            <span v-else style="display:flex;align-items:center;justify-content:space-between;height:36px;padding-left:5px;">
+              <img style="height:20px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
             </span>
           </td>
         </tr>
@@ -1143,15 +1136,20 @@ export default {
       },
       org_id:0,
       tableAdvice:[],
-      projects:[]
+      projects:[],
+      monitorsKtv:0
     }
   },
   methods: {
     getBloodFlow(id){
         let BloodFlowOptions = getDataConfig('hemodialysis', 'blood_flow')
-        if (id in BloodFlowOptions) {
-            return BloodFlowOptions[id].name
-        }
+        let name = ''
+        BloodFlowOptions.map(item => {
+          if(item.id == id){
+            name = item.name
+          }
+        })
+        return name
     },
     getComplication(complication){
         if(complication.indexOf(',') == -1){
@@ -1415,8 +1413,9 @@ export default {
           // this.advices = response.data.data.advices
 
           this.advices =  response.data.data.advices.concat(response.data.data.doctorAdvice)
-
-          this.monitors = response.data.data.monitors
+          let monitors = response.data.data.monitors
+          this.monitors = JSON.parse(JSON.stringify(response.data.data.monitors))
+          this.monitorsKtv = monitors.length > 0 ? monitors[monitors.length - 1].ktv : ''
           this.summary = response.data.data.summary
           this.org_template_info = response.data.data.org_template_info
           // 配置超滤量和置换量是否要显示0还是空
@@ -1432,9 +1431,10 @@ export default {
           this.jilurow = this.monitors.length + 1
           this.projects = response.data.data.projects
           var doctorAdevieInfo = response.data.data.advices
+          console.log('doctorAdevieInfo',doctorAdevieInfo)
           var tableAdvice = doctorAdevieInfo
-          if (tableAdvice.length + this.projects.length < 30) {
-            var nl = 30 - (tableAdvice.length + this.projects.length)
+          if (tableAdvice.length + this.projects.length < 28) {
+            var nl = 28 - (tableAdvice.length + this.projects.length)
             for (let index = 0; index < nl; index++) {
               this.projects.push([])
             }
@@ -1443,60 +1443,60 @@ export default {
 
 
 
-          this.advice_jilurow = this.advices.length + 1
-
-          var childMap = {}
-          for (const index in this.advices) {
-            if (this.advices[index].parent_id == 0) {
-              continue
-            }
-            if (!(this.advices[index].parent_id in childMap)) {
-              childMap[this.advices[index].parent_id] = []
-            }
-            childMap[this.advices[index].parent_id].push(this.advices[index])
-          }
-
-          var advices = []
-          for (const index in this.advices) {
-            if (this.advices[index].parent_id > 0) {
-              continue
-            }
-            var item = this.advices[index]
-            if (item.id in childMap) {
-              item.children = childMap[item.id]
-            } else {
-              item.children = []
-            }
-            advices.push(item)
-          }
-
-          var leftAdvice = []
-          var rightAdvice = []
-          var adlen = advices.length
-
-          var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2
-          for (var i = 0; i < halfLen; i++) {
-            leftAdvice.push(advices[i])
-            rightAdvice.push(advices[i + halfLen])
-          }
-          if (halfLen < 5) {
-            var nl = 5 - leftAdvice.length
-            for (let index = 0; index < nl; index++) {
-              leftAdvice.push([])
-            }
-            var nl = 5 - rightAdvice.length
-            for (let index = 0; index < nl; index++) {
-              rightAdvice.push([])
-            }
-          }
-
-          this.advices = []
-          for (var i = 0; i < halfLen; i++) {
-            var item = []
-            item.push(leftAdvice[i])
-            item.push(rightAdvice[i])
-            this.advices.push(item)
-          }
+          // this.advice_jilurow = this.advices.length + 1
+
+          // var childMap = {}
+          // for (const index in this.advices) {
+          //   if (this.advices[index].parent_id == 0) {
+          //     continue
+          //   }
+          //   if (!(this.advices[index].parent_id in childMap)) {
+          //     childMap[this.advices[index].parent_id] = []
+          //   }
+          //   childMap[this.advices[index].parent_id].push(this.advices[index])
+          // }
+
+          // var advices = []
+          // for (const index in this.advices) {
+          //   if (this.advices[index].parent_id > 0) {
+          //     continue
+          //   }
+          //   var item = this.advices[index]
+          //   if (item.id in childMap) {
+          //     item.children = childMap[item.id]
+          //   } else {
+          //     item.children = []
+          //   }
+          //   advices.push(item)
+          // }
+
+          // var leftAdvice = []
+          // var rightAdvice = []
+          // var adlen = advices.length
+
+          // var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2
+          // for (var i = 0; i < halfLen; i++) {
+          //   leftAdvice.push(advices[i])
+          //   rightAdvice.push(advices[i + halfLen])
+          // }
+          // if (halfLen < 5) {
+          //   var nl = 5 - leftAdvice.length
+          //   for (let index = 0; index < nl; index++) {
+          //     leftAdvice.push([])
+          //   }
+          //   var nl = 5 - rightAdvice.length
+          //   for (let index = 0; index < nl; index++) {
+          //     rightAdvice.push([])
+          //   }
+          // }
+
+          // this.advices = []
+          // for (var i = 0; i < halfLen; i++) {
+          //   var item = []
+          //   item.push(leftAdvice[i])
+          //   item.push(rightAdvice[i])
+          //   this.advices.push(item)
+          // }
           this.loading = false
 
           this.doctor_advices =

src/xt_pages/user/courseOfDisease.vue

@@ -218,7 +218,9 @@
         selectingRows: [],
         table_current_index: -1,
         edit_current_id: 0,
-        edit_title: ''
+        edit_title: '',
+        ids:"",
+        idArr:[],
       }
     },
     created() {
@@ -366,6 +368,14 @@
       },
 
       didSelectionChange: function(selectRows) {
+       
+        var arr = []
+        for(let i=0;i<selectRows.length;i++){
+           arr.push(selectRows[i].id)
+        }
+        var newArr = arr.join(',') 
+        this.ids = newArr
+        console.log("select23322332",this.ids)
         this.selectingRows = selectRows
       },
       deleteAction: function() {
@@ -422,12 +432,17 @@
         row.index = rowIndex
       }, onRowClick(row, event, column) {
         this.table_current_index = row.index
-      },print(){
-        if (this.table_current_index == -1) {
+      },
+      print(){
+        // if (this.table_current_index == -1) {
+        //   this.$message.error('请选择要打印的病程')
+        //   return
+        // }
+        if(this.ids.length == 0){
           this.$message.error('请选择要打印的病程')
           return
         }
-        this.$router.push({ path: "/course/print?id="+this.records[this.table_current_index].id});
+        this.$router.push({ path: "/course/print?ids="+this.ids+"&patient_id="+this.patient_id});
       }
     }
   }

src/xt_pages/user/coursePrint.vue

@@ -24,35 +24,39 @@
             </div>
 
             <div style="flex:1;text-align: center;">
-              床位：
-              <div  style="width: 120px;text-align: left;display:inline-block;">{{patient.DialysisSchedule&&patient.DialysisSchedule.device_number?patient.DialysisSchedule.device_number.number:''}}</div>
+              透析号：
+                <div  style="width: 120px;text-align: left;display:inline-block;">
+                  {{patient.dialysis_no?patient.dialysis_no:"/"}}
+                </div>
             </div>
 
             <div  style="flex:1;text-align: center;">
               住院号：
-              <div style="width: 100px;text-align: left;display:inline-block;" v-if="patient.admission_number">
-                {{patient.admission_number}}
-              </div>
-              <div style="width: 100px;;display:inline-block;" v-else>
-                {{'/'}}
+              <div style="width: 100px;text-align: left;display:inline-block;">
+                 {{patient.admission_number?patient.admission_number:"/"}}
               </div>
+           
             </div>
 
           </div>
-          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;">
+          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;" v-for="(item,index) in this.record" :key="index">
             <div class="inline_block">
-              <div>{{getTime(record.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
+              <div>{{getTime(item.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
             </div>
             <div class="inline_block" style="margin-left: 30px">
-              <div>{{record.title}}</div>
+              <div>{{item.title}}</div>
+            </div>
+
+             <div class="inline_block" style="width:100%;">
+              <div v-html="item.content" class="printP">{{item.content}}</div>
             </div>
           </div>
 
-          <div class="row" style="padding: 2px 0;line-height:24px;">
+          <!-- <div class="row" style="padding: 2px 0;line-height:24px;">
             <div class="inline_block" style="width:100%;">
-              <div v-html="record.content" class="printP">{{record.content}}</div>
+              <div v-html="item.content" class="printP">{{item.content}}</div>
             </div>
-          </div>
+          </div> -->
 
         </div>
       </div>
@@ -81,7 +85,7 @@
 
         loading: false,
         orgname: '',
-        record: {},
+        record:[],
         patient: {}
       }
     },
@@ -92,16 +96,22 @@
     },
     mounted() {
       this.loading = true
-      var id = this.$route.query.id
-      if (id == 0) {
-        this.$router.back(-1)
-        return
+      var ids = this.$route.query.ids
+      var patient_id = parseInt(this.$route.query.patient_id)
+      var params = {
+          ids:ids,
+          patient_id:patient_id,
       }
-      GetCoursePrintData(id).then(rs => {
+      console.log("para2333223233223",params)
+      GetCoursePrintData(params).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           this.record = resp.data.record
-          this.record.content = resp.data.record.content.replace(new RegExp('<p>','g'),"<div>").replace(new RegExp('</p>','g'),"</div>")
+          console.log("h2232323223",this.record)
+          // for(let i=0;i<this.record.length;i++){
+          //   this.record[i].content = this.record[i].content.replace(new RegExp('<p>','g'),"<div>").replace(new RegExp('</p>','g'),"</div>")
+          // }
+          console.log("h2232323223",this.record)
           this.patient = resp.data.patient
 
           this.loading = false

src/xt_pages/user/hospitalSummary.vue

@@ -7,7 +7,7 @@
         <div>
                     <span style="margin-left: 10px;float:right;">
                         <el-button type="primary" icon="el-icon-circle-plus-outline" size="small"
-                                   @click="show_dialog = true">新增</el-button>
+                                   @click="addAction">新增</el-button>
 
                         <el-button type="primary" icon="el-icon-edit-outline" size="small"
                                    @click="toEdit">修改</el-button>
@@ -77,7 +77,7 @@
                    {{getDoctor(hosDetail.doctor)}}
                 </div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">记录日期:
-                  <span v-if="hosDetail.record_time > 0">{{getTime(hosDetail.record_time)}}</span> 
+                  <span v-if="hosDetail.record_date > 0">{{getTime(hosDetail.record_date)}}</span> 
                 </div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">病案号:
                    {{hosDetail.sick_personnel}}
@@ -98,22 +98,22 @@
                    {{hosDetail.pathology}}
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">入院诊断:
-                   {{hosDetail.admitting_diagnosis}}
+                   <span v-html="hosDetail.admitting_diagnosis"></span> 
                  </div>
                   <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院诊断:
-                   {{hosDetail.discharge_diagnosis}}
+                   <span v-html="hosDetail.discharge_diagnosis"></span>
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">入院时病情:
-                   {{hosDetail.diagnosis_admission}}
+                   <span v-html="hosDetail.diagnosis_admission"></span>
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">诊断经过:
-                   {{hosDetail.treatment}}
+                   <span v-html="hosDetail.treatment"></span> 
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院时病情:
-                   {{hosDetail.illness_discharge}}
+                   <span v-html="hosDetail.illness_discharge"></span> 
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院医嘱:
-                   {{hosDetail.discharge_advice}}
+                    <span v-html="hosDetail.discharge_advice"></span>
                  </div>
                
               </div>
@@ -247,7 +247,7 @@
                 <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorTwo"
-                              id="editorsTwo"
+                              id="editorTwo"
                               style="width: 800px"
                               v-bind:r_content="form.diagnosis_admission">
                       </editor>
@@ -284,7 +284,7 @@
                <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorFive"
-                              id="editorsFive"
+                              id="editorFive"
                               style="width: 800px"
                               v-bind:r_content="form.illness_discharge">
                       </editor>
@@ -302,7 +302,7 @@
                 <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorSix"
-                              id="editorsSix"
+                              id="editorSix"
                               style="width: 800px"
                               v-bind:r_content="form.discharge_advice">
                       </editor>
@@ -442,8 +442,8 @@
 
                 <div class="textarea_panel">
                     <keep-alive>
-                      <editor ref="editorEight"
-                              id="editorEight"
+                      <editor ref="editorSixty"
+                              id="editorSixty"
                               style="width: 800px"
                               v-bind:r_content="form.diagnosis_admission">
                       </editor>
@@ -479,8 +479,8 @@
 
                <div class="textarea_panel">
                     <keep-alive>
-                      <editor ref="editorElement"
-                              id="editorElement"
+                      <editor ref="editorThirty"
+                              id="editorThirty"
                               style="width: 800px"
                               v-bind:r_content="form.illness_discharge">
                       </editor>
@@ -583,8 +583,8 @@
         form:{
           id:0,
           title:"",
-          admission_time:new Date(),
-          discharge_time:new Date(),
+          admission_time:this.getTime(new Date()),
+          discharge_time:this.getTime(new Date()),
           sick_personnel:"",
           xray:"",
           admitting_diagnosis_id:"",
@@ -599,7 +599,7 @@
           illness_discharge:"",
           dean:"",
           doctor:"",
-          record_date:new Date(),
+          record_date:this.getTime(new Date()),
           discharge_advice_id:"",
           discharge_advice:"",
           connecticut:"",
@@ -612,13 +612,14 @@
        docList:[],
        doctorList:[],
        hosDetail:{},
+       ids:"",
       }
     },
     created() {
      
-     
+ 
       this.patient_id = this.$route.params && this.$route.params.id
-      console.log("患者2332323",this.patient_id)
+      console.log("患者2332323",this.$store.getters.configlist.admitting_diagnosis)
       var now = new Date()
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
@@ -673,61 +674,140 @@
 
        },
       changeCurrentRecordTwo(row){
-        this.form.id = row.id 
-        this.getHospitalSummaryDetail(row.id)
+       
+        this.form.id = 0
+        if(row!=null){
+          this.form.id = row.id 
+          this.getHospitalSummaryDetail(row.id)
+        }
       },
       selectSummary(row){
-       console.log("row322323",row)
+        var arr = []
+        for(let i=0;i<row.length;i++){
+          arr.push(row[i].id)
+        }
+       var ids = arr.join(",")
+       this.ids = ids
       },
       changeAmittDiagnosis(content){
+        
         this.form.admitting_diagnosis = content
       },
       changeDischargeDiagnosis(content){
+       
          this.form.discharge_diagnosis = content
       },
       changeDiagnosisAdmission(content){
+      
        this.form.diagnosis_admission = content
       },
       changeTreatment(content){
+       
         this.form.treatment = content
       },
       changeillnessDisCharge(content){
+      
         this.form.illness_discharge = content
       },
       changeDischargeAdvice(content){
+      
         this.form.discharge_advice = content
       },
       createAction(){
+         console.log("hh23h",this.templates)
+         var admitting_diagnosis_id = ""
+         var discharge_diagnosis_id = ""
+         var diagnosis_admission_id = ""
+         var treatment_id = ""
+         var illness_discharge_id=""
+         var discharge_advice_id= ""
+         
+         if(this.templates!=undefined){
+            for(let i=0;i<this.templates.length;i++){
+            if(this.form.admitting_diagnosis_id == this.templates[i].content){
+            
+                admitting_diagnosis_id = this.templates[i].title
+              }
+          }
+         }
+       
+         if(this.templatesOne!=undefined){
+          for(let i=0;i<this.templatesOne.length;i++){
+           if(this.form.discharge_diagnosis_id == this.templatesOne[i].content){
+              discharge_diagnosis_id = this.templatesOne[i].title
+            }
+          }
+         }
+         
+         if(this.templatesTwo!=undefined){
+          for(let i=0;i<this.templatesTwo.length;i++){
+            if(this.form.diagnosis_admission_id == this.templatesTwo[i].content){
+                diagnosis_admission_id = this.templatesTwo[i].title
+              }
+          }
+         }
+        
+        if(this.templatesThree!=undefined){
+         for(let i=0;i<this.templatesThree.length;i++){
+           if(this.form.treatment_id == this.templatesThree[i].content){
+              treatment_id = this.templatesThree[i].title
+            }
+         }
+        }
+        
+        if(this.templatesFour!=undefined){
+          for(let i=0;i<this.templatesFour.length;i++){
+           if(this.form.illness_discharge_id == this.templatesFour[i].content){
+              illness_discharge_id = this.templatesFour[i].title
+            }
+         }
+        }
          
+        if(this.templatesFive!=undefined){
+         for(let i=0;i<this.templatesFive.length;i++){
+           if(this.form.discharge_advice_id == this.templatesFive[i].content){
+              discharge_advice_id = this.templatesFive[i].title
+            }
+         }
+        }
+
+       
+         if(this.form.doctor == ""){
+            this.form.doctor = 0
+         }
+         if(this.form.dean == ""){
+           this.form.dean = 0
+         }
+         console.log("hhj232322323",this.form.admitting_diagnosis_id)
          var params = {
           patient_id:parseInt(this.patient_id),
           title:this.form.title,
-          admission_time:this.getTime(this.form.admission_time),
-          discharge_time:this.getTime(this.form.discharge_time),
+          admission_time:this.form.admission_time,
+          discharge_time:this.form.discharge_time,
           sick_personnel:this.form.sick_personnel,
           xray:this.form.xray,
-          admitting_diagnosis_id:this.form.admitting_diagnosis_id,
-          admitting_diagnosis:this.form.admitting_diagnosis,
-          discharge_diagnosis:this.form.discharge_diagnosis,
-          discharge_diagnosis_id:this.form.discharge_diagnosis_id,
-          diagnosis_admission_id:this.form.diagnosis_admission_id,
-          diagnosis_admission:this.form.diagnosis_admission,
-          illness_discharge:this.form.illness_discharge,
-          illness_discharge_id:this.form.illness_discharge_id,
-          discharge_advice_id:this.form.discharge_advice_id,
-          discharge_advice:this.form.discharge_advice,
-          treatment_id:this.form.treatment_id,
-          treatment:this.form.treatment,
+          admitting_diagnosis_id:admitting_diagnosis_id,
+          admitting_diagnosis:this.$refs.editor.content,
+          discharge_diagnosis:this.$refs.editorOne.content,
+          discharge_diagnosis_id:discharge_diagnosis_id,
+          diagnosis_admission_id:diagnosis_admission_id,
+          diagnosis_admission:this.$refs.editorTwo.content,
+          illness_discharge:this.$refs.editorFive.content,
+          illness_discharge_id:illness_discharge_id,
+          discharge_advice_id:discharge_advice_id,
+          discharge_advice:this.$refs.editorSix.content,
+          treatment_id:treatment_id,
+          treatment:this.$refs.editorFour.content,
           dean:this.form.dean,
           doctor:this.form.doctor,
-          record_date:this.getTime(this.form.record_date),
+          record_date:this.form.record_date,
           connecticut:this.form.connecticut,
           nuclear_magnetic_resonance:this.form.nuclear_magnetic_resonance,
           ultrasound:this.form.ultrasound,
           pathology:this.form.pathology,
          }
          console.log("oaram2322323",params)
-         
+        
          createHospitalSummary(params).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
@@ -800,6 +880,7 @@
         getHospitalSummaryDetail(id).then(response=>{
            if(response.data.state == 1){
              var detail = response.data.data.detail
+            
              this.hosDetail = detail
            }
         })
@@ -808,6 +889,13 @@
         getHospitalSummaryDetail(id).then(response=>{
            if(response.data.state == 1){
              var detail = response.data.data.detail
+             console.log("detial323232232323322323",detail)
+             if(detail.doctor == 0){
+               this.form.doctor = ""
+             }
+             if(detail.dean == 0){
+               this.form.dean = ""
+             }
              this.form.id = detail.id
              this.form.title = detail.title
              this.form.patient_id = detail.patient_id
@@ -822,20 +910,21 @@
              this.form.admitting_diagnosis_id = detail.admitting_diagnosis_id
              this.form.admitting_diagnosis = detail.admitting_diagnosis
              this.form.discharge_diagnosis = detail.discharge_diagnosis
+             console.log("出院争端233232",detail.discharge_diagnosis_id)
              this.form.discharge_diagnosis_id = detail.discharge_diagnosis_id
              this.form.diagnosis_admission_id = detail.diagnosis_admission_id
              this.form.diagnosis_admission = detail.diagnosis_admission
+             console.log("详情233232232323",this.form.diagnosis_admission)
              this.form.treatment_id = detail.treatment_id
              this.form.treatment = detail.treatment
              this.form.illness_discharge_id = detail.illness_discharge_id
              this.form.illness_discharge = detail.illness_discharge
              this.form.discharge_advice_id = detail.discharge_advice_id
              this.form.discharge_advice = detail.discharge_advice
-             this.form.record_time = detail.record_time
+             this.form.record_time = this.getTime(detail.record_time)
+             this.form.record_date = this.getTime(detail.record_date)
              this.form.dean = detail.dean_id
              this.form.doctor = detail.doctor
-             this.form.record_date = detail.record_date
-             this.hosDetail = detail
              this.edit_show_dialog = true
            }
         })
@@ -844,7 +933,115 @@
         this.getHospitalSummaryDetailOne(this.form.id)
       },
       updateAction(){
-         console.log("hhhahdf2332332",this.form.admission_time)
+         var admitting_diagnosis_id = this.form.admitting_diagnosis_id
+         var discharge_diagnosis_id = this.form.discharge_diagnosis_id
+         var diagnosis_admission_id = this.form.diagnosis_admission_id
+         var treatment_id = this.form.treatment_id
+         var illness_discharge_id= this.form.illness_discharge_id
+         var discharge_advice_id= this.form.discharge_advice_id
+
+         if(this.templates!=undefined){
+            for(let i=0;i<this.templates.length;i++){
+            if(this.form.admitting_diagnosis_id == this.templates[i].content){
+            
+                admitting_diagnosis_id = this.templates[i].title
+              }
+          }
+         }
+        
+        
+         if(this.templatesOne!=undefined){
+          for(let i=0;i<this.templatesOne.length;i++){
+           if(this.form.discharge_diagnosis_id == this.templatesOne[i].content){
+              discharge_diagnosis_id = this.templatesOne[i].title
+            }
+          }
+         }
+        console.log("6666666",this.form.diagnosis_admission_id)
+        console.log("777777777",this.templatesTwo)
+        console.log("8888888",this.$refs.editorSixty.content)
+         if(this.templatesTwo!=undefined){
+          for(let i=0;i<this.templatesTwo.length;i++){
+            if(this.form.diagnosis_admission_id == this.templatesTwo[i].content){
+                diagnosis_admission_id = this.templatesTwo[i].title
+              }
+          }
+         }
+        
+        if(this.templatesThree!=undefined){
+           for(let i=0;i<this.templatesThree.length;i++){
+           if(this.form.treatment_id == this.templatesThree[i].content){
+              treatment_id = this.templatesThree[i].title
+            }
+         }
+        }
+         console.log("99999999",this.templatesFour)
+         console.log("88888888",this.form.illness_discharge_id)
+         console.log("ffffffff",this.$refs.editorThirty.content)
+        if(this.templatesFour!=undefined){
+            for(let i=0;i<this.templatesFour.length;i++){
+           if(this.form.illness_discharge_id == this.templatesFour[i].content){
+              illness_discharge_id = this.templatesFour[i].title
+            }
+         }
+        }
+
+       if(this.templatesFive!=undefined){
+         for(let i=0;i<this.templatesFive.length;i++){
+           if(this.form.discharge_advice_id == this.templatesFive[i].content){
+              discharge_advice_id = this.templatesFive[i].title
+            }
+         }
+       }
+    
+
+      
+        if(this.form.doctor == ""){
+            this.form.doctor = 0
+         }
+         if(this.form.dean == ""){
+           this.form.dean = 0
+         }
+        var admitting_diagnosis = ""
+        var discharge_diagnosis = ""
+        var diagnosis_admission = ""
+        var discharge_advice = ""
+        var treatment = ""
+        var illness_discharge = ""
+        if(this.$refs.editorTen.content == ""){
+            admitting_diagnosis = this.form.admitting_diagnosis
+         }else{
+            admitting_diagnosis = this.$refs.editorTen.content
+         }
+         if(this.$refs.editorSeven.content== ""){
+            discharge_diagnosis = this.form.discharge_diagnosis
+         }else{
+           discharge_diagnosis = this.$refs.editorSeven.content
+         }
+
+         if(this.$refs.editorSixty.content == ""){
+            diagnosis_admission = this.form.diagnosis_admission
+         }else{
+           diagnosis_admission = this.$refs.editorSixty.content 
+         }
+         
+         if(this.$refs.editorThirty.content == ""){
+            illness_discharge = this.form.illness_discharge
+         }else{
+           illness_discharge = this.$refs.editorThirty.content
+         }
+
+         if(this.$refs.editorTwelve.content == ""){
+            discharge_advice = this.form.discharge_advice
+         }else{
+            discharge_advice = this.$refs.editorTwelve.content
+         }
+
+         if(this.$refs.editorNight.content == ""){
+            treatment = this.form.treatment
+         }else{
+            treatment = this.$refs.editorNight.content
+         }
          var params = {
           id:this.form.id,
           patient_id:parseInt(this.patient_id),
@@ -853,18 +1050,18 @@
           discharge_time:this.form.discharge_time,
           sick_personnel:this.form.sick_personnel,
           xray:this.form.xray,
-          admitting_diagnosis_id:this.form.admitting_diagnosis_id,
-          admitting_diagnosis:this.form.admitting_diagnosis,
-          discharge_diagnosis:this.form.discharge_diagnosis,
-          discharge_diagnosis_id:this.form.discharge_diagnosis_id,
-          diagnosis_admission_id:this.form.diagnosis_admission_id,
-          diagnosis_admission:this.form.diagnosis_admission,
-          illness_discharge:this.form.illness_discharge,
-          illness_discharge_id:this.form.illness_discharge_id,
-          discharge_advice_id:this.form.discharge_advice_id,
-          discharge_advice:this.form.discharge_advice,
-          treatment_id:this.form.treatment_id,
-          treatment:this.form.treatment,
+          admitting_diagnosis_id:admitting_diagnosis_id,
+          admitting_diagnosis:admitting_diagnosis,
+          discharge_diagnosis:discharge_diagnosis,
+          discharge_diagnosis_id:discharge_diagnosis_id,
+          diagnosis_admission_id:diagnosis_admission_id,
+          diagnosis_admission:diagnosis_admission,
+          illness_discharge:illness_discharge,
+          illness_discharge_id:illness_discharge_id,
+          discharge_advice_id:discharge_advice_id,
+          discharge_advice:discharge_advice,
+          treatment_id:treatment_id,
+          treatment:treatment,
           dean:this.form.dean,
           doctor:this.form.doctor,
           record_date:this.getTime(this.form.record_date),
@@ -872,30 +1069,36 @@
           nuclear_magnetic_resonance:this.form.nuclear_magnetic_resonance,
           ultrasound:this.form.ultrasound,
           pathology:this.form.pathology,
+          record_date:this.form.record_date,
          }
-        console.log("param2332233223232323",params)
-     
+        console.log("比你强2332322323232",params)
+   
         updateHospitalSummary(params).then(response=>{
           if(response.data.state == 1){
             var detail = response.data.data.detail
             this.edit_show_dialog = false
+            // this.$refs.monthlyPlanTable.setCurrentRow(detail)
             this.getlist()
           }
         }) 
       },
-      deleteAction(id,index){
+      deleteAction(){
+          if(this.ids.length == 0){
+            this.$message.error("请勾选需要删除的数据")
+            return false
+          }
           this.$confirm('确认删除吗?', '删除', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
             type: 'warning'
          }).then(() => {
             var params = {
-              id:this.form.id,
+              ids:this.ids,
             }
             deleteHospitalSummary(params).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg
-                  this.tableData.splice(index, 1);
+                  this.getlist()
                   this.$message.success("删除成功")
               } else {
                   this.$message.error("删除失败")
@@ -903,6 +1106,32 @@
             })
           }).catch(() => {
           }) 
+      },
+      addAction(){
+        this.form.title = ""
+        this.form.sick_personnel = ""
+        this.form.xray = ""
+        this.form.admitting_diagnosis = ""
+        this.form.discharge_diagnosis = ""
+        this.form.diagnosis_admission = ""
+        this.form.illness_discharge = ""
+        this.form.discharge_advice = ""
+        this.form.treatment = ""
+        this.form.connecticut = ""
+        this.form.nuclear_magnetic_resonance = ""
+        this.form.ultrasound = ""
+        this.form.pathology = ""
+        this.form.admitting_diagnosis_id = ""
+        this.form.discharge_diagnosis_id = ""
+        this.form.illness_discharge_id = ""
+        this.form.discharge_advice_id  =""
+        this.form.treatment_id = "" 
+        this.form.dean = ""
+        this.form.doctor = ""
+        this.form.admission_time = this.getTime(new Date())
+        this.form.admission_time = this.getTime(new Date()),
+        this.form.discharge_time = this.getTime(new Date()),
+        this.show_dialog = true
       }
     },
     watch: {

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -7,38 +7,39 @@
     <div class="dialysis-print-order">
       <div class="order-yy-name"></div>
       <div class="order-title">{{ orgname }}出院小结</div>
+      <div style="margin-float:right">病案号:{{hosDetail.sick_personnel}}</div>
       <div>
         <table class="print-table" border="1" style="margin-top: 10px;">
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               姓名:
             </td>
-             <td style="text-align:center;width:170px" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{patient.name}}
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               性别:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 <span v-if="patient.gender == 1">男</span>
                 <span v-if="patient.gender == 2">女</span>
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               年龄:
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                  {{getNewAge(patient.id_card_no)}}
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               婚姻:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                  <span v-if="patient.marital_status == 0">未婚</span>
                  <span v-if="patient.marital_status == 1">已婚</span>
@@ -47,18 +48,18 @@
                  <span v-if="patient.marital_status == 4">丧偶</span>
               </span>
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               职业: 
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{getProfession(patient.profession)?getProfession(patient.profession):''}}
               </span>
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               电话:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{patient.phone}}
               </span>
@@ -85,28 +86,28 @@
                 {{getTime(hosDetail.admission_time)}}
               </span>
             </td>
-            <td style="text-align:center;width:170px" colspan="2">
+            <td style="text-align:center;width:100px" colspan="2">
               出院时间:
             </td>
-            <td style="text-align:center;width:170px" colspan="2">
+            <td style="text-align:center;width:100px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
                 {{getTime(hosDetail.discharge_time)}}
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:100px"  colspan="1">
               住院天数:
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{getTimeDay(hosDetail.admission_time,hosDetail.discharge_time)}}
                
               </span>
             </td>
-            <td style="text-align:center;" colspan="2">
+            <td style="text-align:center;width:50px" colspan="2">
               转归:
             
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 <span v-if="patient.lapseto == 1">留治</span>
                 <span v-if="patient.lapseto == 2">转归</span>
@@ -115,45 +116,45 @@
             
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="2">
+            <td style="text-align:center;width:50px" colspan="1">
               检查号:
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="2">
               X线:
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{hosDetail.xray}}
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               CT:
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{hosDetail.connecticut}}
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               MRI:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{hosDetail.nuclear_magnetic_resonance}}
               </span>
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               超声:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{hosDetail.ultrasound}}
               </span>
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               病理:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{hosDetail.pathology}}
               </span>
@@ -168,7 +169,7 @@
             </td>   
             <td style="text-align:center;" colspan="11">
               <span style="display:inline-block;margin-left:10px;">
-                {{hosDetail.admitting_diagnosis_id}}
+                <span v-html="hosDetail.admitting_diagnosis"></span>
               </span>
             </td>   
           </tr>
@@ -179,7 +180,7 @@
              <td style="text-align:center;width:170px" colspan="11">
              
               <span style="display:inline-block;margin-left:10px;">
-                {{hosDetail.discharge_diagnosis_id}}
+               <span v-html="hosDetail.discharge_diagnosis"></span>  
               </span>
             </td>
             
@@ -191,7 +192,7 @@
            <td style="text-align:center;width:170px" colspan="11">
             
               <span style="display:inline-block;margin-left:10px;">
-                 {{hosDetail.diagnosis_admission_id}}
+                 <span v-html="hosDetail.diagnosis_admission"></span>
               </span>
             </td>
             
@@ -204,7 +205,7 @@
             </td>
             <td style="text-align:center;width:170px" colspan="11">
               <span style="display:inline-block;margin-left:10px;">
-                {{hosDetail.treatment}}
+               <span v-html="hosDetail.treatment"></span> 
               </span>
             </td>
             
@@ -216,7 +217,7 @@
             <td style="text-align:center;width:170px" colspan="11">
             
               <span style="display:inline-block;margin-left:10px;">
-                {{hosDetail.illness_discharge}}
+               <span v-html="hosDetail.illness_discharge"></span> 
               </span>
             </td>
           
@@ -228,7 +229,7 @@
             </td>
             <td style="text-align:center;width:170px" colspan="11">
               <span style="display:inline-block;margin-left:10px;">
-                {{hosDetail.discharge_advice}}
+                <span v-html="hosDetail.discharge_advice"></span> 
               </span>
             </td>
             

src/xt_pages/user/templateSummary.vue

@@ -331,7 +331,7 @@
                                 v-bind:r_content="form.template_plan_content">
                         </editor>
                     </keep-alive>
-                    
+
                   </el-row> -->
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
@@ -672,7 +672,7 @@
               <el-form-item>
                 <span>选择检验检查时间:</span>
                 <div>
-                
+
                  <el-form-item label="时间:">
                    <el-radio-group style="padding: 10px;"  v-model="radio" @change="changeRadio">
                       <el-radio :label="1">月份</el-radio>
@@ -966,8 +966,8 @@
       }
     },
     created() {
-     
-      console.log("this.$store.getters.xt_user.user.id",this.$store.getters.xt_user.user.id)
+
+      // console.log("this.$store.getters.xt_user.user.id",this.$store.getters.xt_user.user.id)
       this.patient_id = this.$route.params && this.$route.params.id
       var now = new Date()
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
@@ -1207,7 +1207,7 @@
               end_time = moment().month(2).endOf('month').format("YYYY-MM-DD")
             }
             if(this.quartype == 2){
-              start_time = moment().month(3).startOf('month').format("YYYY-MM-DD")   
+              start_time = moment().month(3).startOf('month').format("YYYY-MM-DD")
               end_time = moment().month(5).endOf('month').format("YYYY-MM-DD")
             }
             if(this.quartype == 3){
@@ -1219,8 +1219,8 @@
               end_time = moment().month(11).endOf('month').format("YYYY-MM-DD")
             }
           }
-         
-        
+
+
           console.log("start_time",start_time)
           console.log("end_time",end_time)
           var params = {
@@ -1350,7 +1350,7 @@
         console.log("年",year)
         var month = this.form.start_year+"-"+this.form.start_month+"-"+"01"
         console.log("月",this.$refs)
-      
+
 
          var params = {
             title:this.form.title,
@@ -1425,7 +1425,7 @@
         })
       },
       getTemplateSummaryList(){
-        
+
           var params = {
             patient_id:this.patient_id,
             start_time:this.start_time,
@@ -1646,8 +1646,8 @@
             inspect_date:this.projectIndate,
          }
          console.log("parawm232323223",params)
-        
-       
+
+
         UpdateTemplateSummary(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list

src/xt_pages/workforce/components/template_table.vue

@@ -301,6 +301,7 @@
     },
     watch: {
       'device_numbers': function() {
+        console.log("中国人民2333232333323322332",this.device_numbers)
         this.opera_device_numbers = this.makeDeviceNumbers(this.device_numbers)
         this.origin_device_numbers = this.makeDeviceNumbers(this.device_numbers)
       },
@@ -461,23 +462,27 @@
       //     }
       // },
       makeDeviceNumbers: function(device_numbers) {
+        
         var maked_device_numbers = []
         var weekdays = [1, 2, 3, 4, 5, 6, 7] // 周一-周日
         var time_types = [1, 2, 3] // 上下晚
         for (let index = 0; index < device_numbers.length; index++) {
           const device_number = device_numbers[index]
-          var zone = {
-            id: device_number.zone.id,
-            name: device_number.zone.name,
-            type: device_number.zone.type
-          }
-          var device = {
-            id: device_number.id,
-            number: device_number.number,
-            group_id: device_number.group_id,
-            zone_id: device_number.zone_id,
-            zone: zone
+          if(device_number.zone!=null){
+            var zone = {
+              id: device_number.zone.id,
+              name: device_number.zone.name,
+              type: device_number.zone.type
+            }
+            var device = {
+              id: device_number.id,
+              number: device_number.number,
+              group_id: device_number.group_id,
+              zone_id: device_number.zone_id,
+              zone: zone
+            }
           }
+         
 
           // 以 weekday_timetype 为 key，{pid: 0, name: "", treat_mode_id: 0, treat_mode: ""} 为 value，加入到 maked_device_numbers 中
           for (let w_i = 0; w_i < weekdays.length; w_i++) {

src/xt_pages/workforce/template.vue

@@ -103,6 +103,7 @@
 
 
         <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
+        <!-- <el-button size="small" icon="el-icon-setting" type="primary" @click="setData">同步数据</el-button> -->
       </div>
       <!-- </el-col> -->
     </div>
@@ -131,6 +132,30 @@
       <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode"
                               @chenge_mode="didChangeTemplateMode"></set-up-template-dialog>
     </div>
+
+     <el-dialog title="同步排班" width="600px" :visible.sync="newVisible">
+            <el-form :model="form"  ref="form" label-width="90px" :rules="rules">
+                <el-form-item label="同步周次:">
+                   <el-radio v-model="form.firstWeek" label="1">第一周</el-radio>
+                   <el-radio v-model="form.firstWeek" label="2">第二周</el-radio>
+                </el-form-item>
+                <el-form-item label="同步到 :">
+                  <el-select v-model="form.copyWeek" placeholder="请选择" required  prop="copyWeek">
+                      <el-option
+                      v-for="item in typeOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                      </el-option>
+                  </el-select>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="newVisible=false">取 消</el-button>
+                <el-button type="primary" @click="submitAction('form')">保 存</el-button>
+            </div>
+      </el-dialog>
   </div>
 </template>
 
@@ -139,7 +164,7 @@
   import TemplateTable from './components/template_table'
   import { getTemplateInitData } from '@/api/schedule_template/patient'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { exportScheduleTemplate, getWeekPanels,initDate } from '@/api/schedule'
+  import { exportScheduleTemplate, getWeekPanels,initDate,synchroSchedule } from '@/api/schedule'
   import ScheduleTemplateUploadExcel from './components/scheduleTemplateUploadExcel/index'
   import { generateLog } from '@/api/config'
 
@@ -192,11 +217,62 @@
         },
         firstWeekData:[],
         secondWeekData:[],
-        tableList:[]
+        tableList:[],
+        newVisible:false,
+        weekList: [],
+        currentFirstDate1: '',
+        rules: {
+           copyWeek: [{ required: true, message: "请选择复制时间段", trigger: "blur" }],
+         },
+        weekNum:'',
+        weekDayArr:[],
+        todayDate:'',
+        clen:7,
+        nowYear: new Date().getFullYear(),
+        schedule_week:0,
+        newDay:[],
+        typeOptions:[],
+        timeOptions:[],
+        form:{
+         firstWeek:"1",
+         secondWeek:"",
+         copyWeek:''
+         
+        },
+        rules: {
+          copyWeek: [{ required: true, message: "请选择同步时间段", trigger: "blur" }],
+        }
       }
     },
     created() {
+      let year = new Date().getFullYear()
+     let month = new Date().getMonth() + 1
+     let date = new Date().getDate()
+     this.weekNum = this.getYearWeek(year,month,date)
+     this.todayDate=this.formatDate(new Date())
+     this.setDate(new Date())
+
+     for (var i = 0; i <= 9; i++) {
+       this.setDate1(this.addDate(this.currentDate, 7))
+     }
+     let newNum = 0
+     for(let i = 0; i < this.weekList.length; i++){
+         if(this.weekNum + i + 1 <= 53){
+             let num = this.weekNum + i 
+            let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + num + ')'
+             this.typeOptions.push({value:i,label:str})
+            let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
+            this.timeOptions.push({value:i,label:stt})
+        }else{
+
+            newNum++
+            let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + newNum + ')'
+            this.typeOptions.push({value:i,label:str})
+            let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
+            this.timeOptions.push({value:i,label:stt})
+          }
 
+      }
       this.getWeekPanels()
       this.getInitDate()
       getTemplateInitData().then(rs => {
@@ -217,7 +293,7 @@
           this.template_mode = mode
           this.origin_mode = mode.mode
           this.device_numbers = device_numbers
-     
+         
           this.patients = patients
          
           this.first_template = templates[0]
@@ -248,7 +324,68 @@
       })
     },
     methods: {
-      refresh(){
+      getYearWeek(year,month,date){
+      /*
+          dateNow是当前日期
+          dateFirst是当年第一天
+          dataNumber是当前日期是今年第多少天
+          用dataNumber + 当前年的第一天的周差距的和在除以7就是本年第几周
+      */
+      let dateNow = new Date(year, parseInt(month) - 1, date);
+      let dateFirst = new Date(year, 0, 1);
+      let dataNumber = Math.round((dateNow.valueOf() - dateFirst.valueOf()) / 86400000);
+     
+      return Math.ceil((dataNumber + ((dateFirst.getDay() + 1) - 1)) / 7);
+      },
+      getTimestamp(time) { //把时间日期转成时间戳
+      return (new Date(time)).getTime() / 1000
+    },
+
+      formatDate(date){
+          var year = date.getFullYear()+'.'
+          var month = (date.getMonth()+1)+'.';
+          var day = date.getDate();
+          return year+month+day
+      },
+      formatDateTwo(date){
+          var year = date.getFullYear()+'.'
+          var month = (date.getMonth()+1)+'.';
+          var day = date.getDate();
+          return year+month+day
+      },
+      addDate(date,n){
+          date.setDate(date.getDate()+n);
+          return date;
+      },
+          //
+      setDate(date){
+          var week = date.getDay()-1;
+          date = this.addDate(date,week*-1);
+          this.currentFirstDate = new Date(date);
+          this.currentDate = new Date(date)
+          for(var i = 0;i<this.clen; i++){
+              this.weekDayArr.push(this.formatDate(i==0 ? date : this.addDate(date,1)))
+          }
+      },
+      setDate1 (date) {
+          var week = date.getDay() - 1
+        
+          date = this.addDate(date, week * -1)
+         
+          this.currentDate = new Date(date)
+          let arr1 = []
+          for (var i = 0; i < this.clen; i++) {
+              arr1.push(this.formatDate(i == 0 ? date : this.addDate(date, 1)))
+          }
+          this.weekList.push(arr1)
+          
+          let num = this.weekNum
+          this.currentFirstDate1 = num + 1
+      },
+      getTimestamp(time) { //把时间日期转成时间戳
+        return (new Date(time)).getTime() / 1000
+      },
+    refresh(){
         getTemplateInitData().then(rs => {
           var resp = rs.data
           if (resp.state == 1) {
@@ -573,11 +710,6 @@
           return
         }
 
-
-
-
-
-
         let is_system_zone = true
         let is_device_number = true
         let zones = []
@@ -2601,6 +2733,41 @@
           this.downloadLoading = false
         })
 
+      },
+      setData(){
+       this.newVisible = true
+      },
+      submitAction(){
+          var template_id = 0
+           if(this.form.firstWeek == 1){
+             template_id  = this.first_template
+           }
+           if(this.form.firstWeek == 2){
+             template_id = this.second_template
+           }
+           var label = ""
+           for(let i=0;i<this.timeOptions.length;i++){
+               if(this.form.copyWeek == this.timeOptions[i].value){
+                 label = this.timeOptions[i].label
+               }
+            }
+           var start = label.split('~')
+           var copy_startime = this.getTimestamp(start[0])
+           var copy_endtime = this.getTimestamp(start[1])
+           var params = {
+             template_id:template_id.id,
+             copy_startime:copy_startime,
+             copy_endtime:copy_endtime,
+           }
+          console.log("param232323223",params)
+        synchroSchedule(params).then(response=>{
+          if(response.data.state == 1){
+            var msg = response.data.data.msg
+            this.$message.success("同步成功!")
+            this.newVisible = false
+          }
+        })
+ 
       }
     }
   }