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

src/lang/zh.js

     template_plan: '个性化方案',
     admitting_diagnosis: '入院诊断',
     discharge_diagnosis: '出院诊断',
+    diagnosis_admission: '入院时病情',
     treatment: '诊疗经过',
-    illness_discharge: '出院时病情'
+    illness_discharge: '出院时病情',
+    discharge_advice: '出院医嘱'
   }
 }

src/xt_pages/data/template.vue

         { label: this.$t("data_config.template_plan"), key: "template_plan" },
         { label: this.$t("data_config.admitting_diagnosis"), key: "admitting_diagnosis" },
         { label: this.$t("data_config.discharge_diagnosis"), key:"discharge_diagnosis"},
+        { label: this.$t("data_config.diagnosis_admission"), key:"diagnosis_admission"},
         { label: this.$t("data_config.treatment"), key:"treatment"},
         { label: this.$t("data_config.illness_discharge"), key:"illness_discharge"},
       ],

src/xt_pages/dialysis/batch_print/batch_print_order_twentyFive.vue

                         </tr>
                         </tbody>
                         </table>
+                        <table class="table-box">
+                          <tbody>
+                            <tr>
+                              <td width="100">特殊处理情况:</td>
+                              <td style="text-align:left;">{{ record.assessment_before_dislysis.special_treatment ? record.assessment_before_dislysis.special_treatment : '' }}</td>
+                            </tr>
+                          </tbody>
+                        </table>
                     </td>
                     </tr>
                     </tbody>
             var dlegh = 0
             if (
               this.records[recordIndex].monitor_records &&
-              this.records[recordIndex].monitor_records.length < 8
+              this.records[recordIndex].monitor_records.length < 7
             ) {
-              dlegh = 8 - this.records[recordIndex].monitor_records.length
+              dlegh = 7 - this.records[recordIndex].monitor_records.length
             } else {
               dlegh = 0
             }

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

                   </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>
                   </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>
                     </td>
                     <td width="35">kg</td>
                     <td width="50">水肿:</td>
-                    <td width='160'>
+                    <td width='200'>
                         <div>
                             <label-box :isChecked="predialysis.edema.indexOf('无') > -1" showValue="无"></label-box>
                             <label-box :isChecked="predialysis.edema.indexOf('+') > -1" showValue="+"></label-box>
                             &nbsp;{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : ' ' }}
                         </div>
                     </td>
-                    <td width="10">ml</td>
+                    <td width="10">L</td>
                     <!-- <td width="50">吸氧:</td>
                     <td width='80'>
                         <div>
             <td width="60">动脉压<br />mmHg</td>
             <td width="60">静脉压<br />mmHg</td>
             <td width="60">跨膜压<br />mmHg</td>
-            <td width="60">超滤量<br />L</td>
+            <td width="60">超滤量<br />ml</td>
             <td width="60">钠浓度<br/>mmol/L</td>
             <td width="60">电导度<br/>ms/cm</td>
             <td width="40">液温<br/>℃</td>
-            <td width="40">ktv</td>
             <td width="40">血糖<br/>mmol/L</td>
-            <td width="">特殊处理</td>
-            <td width='60'>执行护士</td>
+            <td>执行护士</td>
           </tr>
 
           <tr v-for="monitor in monitors" :key="monitor.id">
             <td>
               &nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
             </td>
-            <td>
-              &nbsp;{{ monitor.ktv ? monitor.ktv : "" }}
-            </td>
             <td>
               &nbsp;{{ monitor.blood_sugar ? monitor.blood_sugar : "" }}
             </td>
-            <td>
-              &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
-            </td>
             <td>
                 <span>
                     <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">{{ getAdminUser(monitor.monitoring_nurse) }}</span>
                         &nbsp;{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }}
                       </div>
                     </td>
-                    <td width="20">L</td>
+                    <td width="20">ml</td>
                     <td width="20"></td>
                     <td width="50">血流量</td>
                     <td width='140'>
                             <label-box :isChecked="getBloodFlow(afterdialysis.blood_flow) == '差'" showValue="差"></label-box>
                         </div>
                     </td>
-                    <!-- <td width="50">水肿</td>
+                    <td width="50">kt/v:</td>
                     <td width='120'>
-                        <div>
-                            <label-box :isChecked="afterdialysis.puncture_point_oozing_blood == 1 ? true : false" showValue="+"></label-box>
-                            <label-box :isChecked="afterdialysis.puncture_point_oozing_blood == 2 ? true : false" showValue="++"></label-box>
-                            <label-box :isChecked="afterdialysis.puncture_point_oozing_blood == 2 ? true : false" showValue="+++"></label-box>
+                        <div class="under-line">
+                          &nbsp;
                         </div>
-                    </td> -->
+                    </td>
                     <td></td>
                   </tr>
                 </tbody>
         <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 class="parent" style="text-align:left;padding-left:10px;">
-            <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.delivery_way }}</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>
+            <div style="display:flex;height:100%;">
+              <span style="width:70%;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>
+            </div>
           </td>
           <td>
             <span v-if="setAdminUserES(advice.advice_doctor) == ''">

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

                 </tr>
                 </tbody>
               </table>
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="100">特殊处理情况:</td>
+                    <td style="text-align:left;">{{ predialysis.special_treatment ? predialysis.special_treatment : '' }}</td>
+                  </tr>
+                </tbody>
+              </table>
             </td>
           </tr>
           </tbody>
                   <td width="10">)</td>
                   <td width="10">mmol/L</td>
                   <td width="90">透析器型号:</td>
-                  <td width="100">
+                  <td width="180">
                     <div class="under-line">
                       &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
                     </div>
             if (this.org_template_info.org_id == 9535) {
               this.isShowZero = true
             }
-            if (this.monitors.length < 8) {
-              var nl = 8 - this.monitors.length
+            if (this.monitors.length < 7) {
+              var nl = 7 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }

src/xt_pages/user/hospitalSummary.vue

               <label class="title"><span class="name">超声</span> : </label>
               <el-input v-model="form.ultrasound" style="width:200px"></el-input>
 
-              <label class="title"><span class="name">pathology</span> : </label>
+              <label class="title"><span class="name">病理</span> : </label>
               <el-input v-model="form.pathology" style="width:200px"></el-input>
             </div>
             
             <div class="cell clearfix" style="margin-top:10px">
-              <label class="title"><span class="name">日常病程</span> : </label>
+              <label class="title"><span class="name">入院诊断</span> : </label>
                 <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
                   <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editor"
+                              id="editors"
+                              style="width: 800px"
+                              v-bind:r_content="form.admitting_diagnosis">
+                      </editor>
+                    </keep-alive>
+                </div>
+            </div>
+
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">出院诊断</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+
+               <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorOne"
+                              id="editorsOne"
+                              style="width: 800px"
+                              v-bind:r_content="form.discharge_diagnosis">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+            </div>
+
+             <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">入院时诊断</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+
+                <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorTwo"
+                              id="editorsTwo"
+                              style="width: 800px"
+                              v-bind:r_content="form.treatment">
+                      </editor>
+                    </keep-alive>
+                </div>
+            </div>
+
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">诊断经过</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+
+               <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorFour"
+                              id="editorsFour"
+                              style="width: 800px"
+                              v-bind:r_content="form.treatment">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+            </div>
+
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">出院时病情</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+
+               <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorFive"
+                              id="editorsFive"
+                              style="width: 800px"
+                              v-bind:r_content="form.new_content">
+                      </editor>
+                    </keep-alive>
+                </div>
             </div>
-            <!-- <div class="cell clearfix" style="margin-top: 10px">
-              <label class="title"><span class="name">病程标题</span> : </label>
-              <el-input v-model="title" style="width: 420px"></el-input>
-            </div> -->
-
-
-            <!-- <div class="textarea_panel">
-              <keep-alive>
-                <editor ref="editor"
-                        id="editors"
-                        style="width: 600px"
-                        v-bind:r_content="new_content"
-                        >
-                </editor>
-              </keep-alive>
-            </div> -->
 
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">出院医嘱</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+
+                <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorSix"
+                              id="editorsSix"
+                              style="width: 800px"
+                              v-bind:r_content="form.new_content">
+                      </editor>
+                    </keep-alive>
+                </div>
+            </div>
+         
             <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
               <el-button @click="show_dialog = false">取消</el-button>
               <el-button type="primary"
           xray:"",
           admitting_diagnosis_id:"",
           admitting_diagnosis:"",
-         connecticut:"",
+          discharge_diagnosis_id:"",
+          discharge_diagnosis:"",
+          connecticut:"",
           nuclear_magnetic_resonance:"",
           ultrasound:"",
           pathology:"",