优化门诊医生科室归属

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -1560,7 +1560,7 @@ public class MzChargeDetailController {
                     Long clnicId = Long.valueOf(mzPrescriptionVo.getSerialNo().replace("clnicId_", ""));
                     clinic = clinicService.queryById(clnicId);
                     mzPrescriptionVo.setDoctorCode(tokenUser.getUserIdCode());
-                    mzPrescriptionVo.setVisitDeptCode(employee.getDeptCode());
+                    mzPrescriptionVo.setVisitDeptCode(clinic.getDeptCode());
                     mzPrescriptionVo.setSerialNo(null);
                 } else {
                     MzfzPatientOrder mzfzPatientOrder = mzfzPatientOrderService.queryBySerialNo(mzPrescriptionVo.getSerialNo());

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -1575,7 +1575,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             if (StringUtils.isNotBlank(smallDept)) {
                 sbd.append("(").append(smallDept).append(")");
             }
-            sbd.append("} ").append(zyReqPrescription.get("admissStatus") == null ? "" : zyReqPrescription.get("admissStatus")).append("侯床").append("</br>");
+            sbd.append("] ").append(zyReqPrescription.get("admissStatus") == null ? "" : zyReqPrescription.get("admissStatus")).append("侯床").append("</br>");
         }
         mzPrescriptionVo.getMzBlRecord().setEmrFzjc(emrFzjc);
         mzPrescriptionVo.getMzBlRecord().setEmrProcess(sbd.toString());

src/main/resources/static/js/mz/clinic.js

@@ -1311,7 +1311,11 @@ function loadCommonClinicTableList(id, queryParams) {
                 valign: 'middle',
                 // sortable: true
                 formatter: function (value, row, index) {
-                    return value + "/" + row.gender + "/" + row.age + "岁";
+                    var age = row.age;
+                    if (age == null || age == "null") {
+                        age = "";
+                    }
+                    return value + "/" + row.gender + "/" + age + "岁";
                 }
             }, {
                 field: 'opDay',
@@ -3179,7 +3183,7 @@ function initAllMzYshZdFysm() {
             }
             var html = '';
             $.each(res.data, function (commentIndex, comment) {
-                if(comment.name.indexOf("，")<0){
+                if (comment.name.indexOf("，") < 0) {
                     //过滤组合的用法
                     html += '<option value="' + comment.code + '">' + comment.name + '</option>';
                 }
@@ -8469,34 +8473,34 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                             }
                             html += "<tr><td></td><td></td><td>X " + prescriptionDetailJson.zyPrescription[0].zyfs + "付</td></tr>";
                             var cyMtjs = prescriptionDetailJson.zyPrescription[0].cyMtjs;
-                            if(cyMtjs==null || cyMtjs=="null"){
-                                cyMtjs="";
+                            if (cyMtjs == null || cyMtjs == "null") {
+                                cyMtjs = "";
                             }
                             var cyJssm = prescriptionDetailJson.zyPrescription[0].cyJssm;
-                            if(cyJssm==null || cyJssm=="null"){
-                                cyJssm="";
+                            if (cyJssm == null || cyJssm == "null") {
+                                cyJssm = "";
                             }
                             var cyJsl = prescriptionDetailJson.zyPrescription[0].cyJsl;
-                            if(cyJsl==null || cyJsl=="null"){
-                                cyJsl="";
+                            if (cyJsl == null || cyJsl == "null") {
+                                cyJsl = "";
                             }
                             var cyZql = prescriptionDetailJson.zyPrescription[0].cyZql;
-                            if(cyZql==null || cyZql=="null"){
-                                cyZql="";
+                            if (cyZql == null || cyZql == "null") {
+                                cyZql = "";
                             }
                             var cyFj = prescriptionDetailJson.zyPrescription[0].cyFj;
-                            if(cyFj==null || cyFj=="null"){
-                                cyFj="";
+                            if (cyFj == null || cyFj == "null") {
+                                cyFj = "";
                             }
                             var cyFfcs = prescriptionDetailJson.zyPrescription[0].cyFfcs;
-                            if(cyFfcs==null || cyFfcs=="null"){
-                                cyFfcs="";
+                            if (cyFfcs == null || cyFfcs == "null") {
+                                cyFfcs = "";
                             }
                             var cyFysm = prescriptionDetailJson.zyPrescription[0].cyFysm;
-                            if(cyFysm==null || cyFysm=="null"){
-                                cyFysm="";
+                            if (cyFysm == null || cyFysm == "null") {
+                                cyFysm = "";
                             }
-                            html += "<tr><td colspan='3'>每天" + cyMtjs+ "剂，"+cyJssm+ cyJsl+"ml，煮取量"+cyZql+"ml，复煎"+cyFj+"次。分"+cyFfcs+"次"+cyFysm+"。</td></tr>";
+                            html += "<tr><td colspan='3'>每天" + cyMtjs + "剂，" + cyJssm + cyJsl + "ml，煮取量" + cyZql + "ml，复煎" + cyFj + "次。分" + cyFfcs + "次" + cyFysm + "。</td></tr>";
                             html += "<tr><td colspan='3'>&nbsp;&nbsp;&nbsp;&nbsp;------(以下空白)------</td></tr>";
                             if (index > 0) {
                                 LODOP.NewPageA();