危急值服务问题解决

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

@@ -1746,6 +1746,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             payWay = getDeposFiles(opId, mzDepositFileVo, now, times, serialNo, totalPayable, payWay, fullNewMzDepositFiles, allRefund, newMzDepositFiles);
             //setMzReceiptSerial(opId, mzDepositFileVo.getPatientId(), times, windows, mzChargeDetails.get(0).getResponceType(), feeMap, now, serialNo, mzReceiptSerial, payWay, totalPayable, 1);
             MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(mzDepositFileVo.getPatientId());
+            Clinic dbClinic = clinicMapper.selectByPatientIdAndTimesAndReceiptNo(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes(), mzDepositFileVo.getReceiptNo());
             mzDepositFileVo.setMzDepositFiles(newMzDepositFiles);
             Integer refundTimes = mzDepositFileVo.getTimes();
             mzDepositFileVo.setTimes(times);
@@ -1758,7 +1759,6 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             updateMzPatientMi.setLvDate(now);
             mzPatientMiMapper.updateMzPatientMi(updateMzPatientMi);
 
-            Clinic dbClinic = clinicMapper.selectByPatientIdAndTimesAndReceiptNo(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes(), mzDepositFileVo.getReceiptNo());
             Clinic newClinic = new Clinic();
             newClinic.setPatientId(mzPatientMi.getPatientId());
             newClinic.setPatientName(mzPatientMi.getName());

src/main/java/cn/hnthyy/thmz/service/impl/thmz/MessageServiceImpl.java

@@ -17,7 +17,7 @@ public class MessageServiceImpl implements MessageService {
     private String serviceUrl;
     @Override
     @Async("asyncServiceExecutor")
-    public int sendWxMessage(String touser, String content) {
+    public Integer sendWxMessage(String touser, String content) {
         if (StringUtils.isBlank(touser)){
             return 0;
         }

src/main/java/cn/hnthyy/thmz/service/thmz/MessageService.java

@@ -10,5 +10,5 @@ public interface MessageService {
      * @param content 消息内容
      * @return
      */
-    int sendWxMessage(String touser,String content);
+    Integer sendWxMessage(String touser,String content);
 }

src/main/java/cn/hnthyy/thmz/webservice/impl/CriticalWebServiceImpl.java

@@ -1,15 +1,11 @@
 package cn.hnthyy.thmz.webservice.impl;
 
 
-import cn.hnthyy.thmz.Utils.SpringBeanUtils;
 import cn.hnthyy.thmz.entity.his.mz.Employee;
 import cn.hnthyy.thmz.entity.his.zd.ZdDeptAll;
 import cn.hnthyy.thmz.mapper.his.zd.ZdDeptAllMapper;
 import cn.hnthyy.thmz.service.his.mz.EmployeeService;
 import cn.hnthyy.thmz.service.his.zd.ZdUnitCodeService;
-import cn.hnthyy.thmz.service.impl.his.mz.EmployeeServiceImpl;
-import cn.hnthyy.thmz.service.impl.his.zd.ZdUnitCodeServiceImpl;
-import cn.hnthyy.thmz.service.impl.thmz.MessageServiceImpl;
 import cn.hnthyy.thmz.service.thmz.MessageService;
 import cn.hnthyy.thmz.webservice.CriticalWebService;
 import lombok.extern.slf4j.Slf4j;

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

@@ -686,7 +686,7 @@ function loadCommonClinicTableList(id, queryParams) {
                     if (row.clinicStatus == 5) {
                         return '<a  title="修改" style="cursor: pointer" onclick="getMzPrescriptionVoUnPaid(\'' + row.patientId + '\',' + row.times + ',' + row.id + ')">修改</a>&nbsp;<a title="详情" style="cursor: pointer" onclick="prescriptionDetail(\'' + row.patientId + '\',' + row.times + ',' + row.id + ',5)">详情</a>';
                         // return '<a  title="修改" style="cursor: pointer" onclick="getMzPrescriptionVoUnPaid(\'' + row.patientId + '\',' + row.times + ',' + row.id + ')">修改</a>&nbsp;<a  title="接诊" style="cursor: pointer" onclick="repeatAccepts(\'' + row.patientId + '\',' + row.times + ',' + row.id + ',\'' + row.deptCode + '\')">接诊</a>&nbsp;<a title="详情" style="cursor: pointer" onclick="prescriptionDetail(\'' + row.patientId + '\',' + row.times + ',' + row.id + ',5)">详情</a>';
-                    } else if (row.clinicStatus == 6) {
+                    } else if (row.clinicStatus == 6 || row.clinicStatus == 7) {
                         return '<a  title="接诊" style="cursor: pointer" onclick="repeatAccepts(\'' + row.patientId + '\',' + row.times + ',' + row.id + ',\'' + row.deptCode + '\')">接诊</a>&nbsp;<a  title="详情" style="cursor: pointer" onclick="prescriptionDetail(\'' + row.patientId + '\',' + row.times + ',' + row.id + ',0)">详情</a>';
                     }
                 }
@@ -3252,7 +3252,7 @@ function loadHealthCheckup() {
                 }
                 if (res.pressureList != null && res.pressureList.length > 0) {
                     html += '<div id="pressureDiv">';
-                    html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">呼吸：</div>';
+                    html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">血压：</div>';
                     html += '<div style="width: calc(100% - 80px); float: left;">';
                     for (var i = 0; i < res.pressureList.length; i++) {
                         html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.pressureList[i].paramsName + '\',\'pressure_\')"><span style="padding: 0px 5px;">';
@@ -5762,107 +5762,110 @@ function printPrescription(patientId, times, clnicId, payMark) {
                         }
                     }
                     //中药处方
-                    var zyPrescription = prescriptionDetailJson.zyPrescription[0].detail;
-                    if (zyPrescription != null && zyPrescription.length > 0) {
-                        var html = "";
-                        for (var i = 0; i < zyPrescription.length; i++) {
-                            if (i % 3 == 0) {
-                                html += "<tr>";
-                            }
-                            html += "<td>";
-                            html += zyPrescription[i].trim();
-                            if (i % 3 == 2) {
-                                html += "</td></tr>";
-                            } else {
-                                html += "</td>";
+                    if(prescriptionDetailJson.zyPrescription!=null && prescriptionDetailJson.zyPrescription.length>0){
+                        var zyPrescription = prescriptionDetailJson.zyPrescription[0].detail;
+                        if (zyPrescription != null && zyPrescription.length > 0) {
+                            var html = "";
+                            for (var i = 0; i < zyPrescription.length; i++) {
+                                if (i % 3 == 0) {
+                                    html += "<tr>";
+                                }
+                                html += "<td>";
+                                html += zyPrescription[i].trim();
+                                if (i % 3 == 2) {
+                                    html += "</td></tr>";
+                                } else {
+                                    html += "</td>";
+                                }
                             }
-                        }
-                        if (zyPrescription.length % 3 != 0) {
-                            html += "</tr>";
-                        }
-                        html += "<tr><td>X " + prescriptionDetailJson.zyPrescription[0].zyfs + "付</td>";
-                        var colNum = 1;
-                        var frequency = prescriptionDetailJson.zyPrescription[0].frequency;
-                        if (frequency != null && frequency != "") {
-                            html += "<td>频率：" + frequency + "</td>";
-                            colNum++;
-                        }
-                        var cyJssm = prescriptionDetailJson.zyPrescription[0].cyJssm;
-                        if (cyJssm != null && cyJssm != "") {
-                            html += "<td>加水说明：" + cyJssm + "</td>";
-                            colNum++;
-                            if (colNum % 3 == 0) {
+                            if (zyPrescription.length % 3 != 0) {
                                 html += "</tr>";
                             }
-                        }
-                        var cyFysm = prescriptionDetailJson.zyPrescription[0].cyFysm;
-                        if (cyFysm != null && cyFysm != "") {
-                            colNum++;
-                            if (colNum % 3 == 1) {
-                                html += "<tr>";
+                            html += "<tr><td>X " + prescriptionDetailJson.zyPrescription[0].zyfs + "付</td>";
+                            var colNum = 1;
+                            var frequency = prescriptionDetailJson.zyPrescription[0].frequency;
+                            if (frequency != null && frequency != "") {
+                                html += "<td>频率：" + frequency + "</td>";
+                                colNum++;
                             }
-                            html += "<td>服用说明：" + cyFysm + "</td>";
-                            if (colNum % 3 == 0) {
-                                html += "</tr>";
+                            var cyJssm = prescriptionDetailJson.zyPrescription[0].cyJssm;
+                            if (cyJssm != null && cyJssm != "") {
+                                html += "<td>加水说明：" + cyJssm + "</td>";
+                                colNum++;
+                                if (colNum % 3 == 0) {
+                                    html += "</tr>";
+                                }
                             }
-                        }
-                        var cyDj = prescriptionDetailJson.zyPrescription[0].cyDj;
-                        if (cyDj != null && cyDj != "") {
-                            colNum++;
-                            if (colNum % 3 == 1) {
-                                html += "<tr>";
+                            var cyFysm = prescriptionDetailJson.zyPrescription[0].cyFysm;
+                            if (cyFysm != null && cyFysm != "") {
+                                colNum++;
+                                if (colNum % 3 == 1) {
+                                    html += "<tr>";
+                                }
+                                html += "<td>服用说明：" + cyFysm + "</td>";
+                                if (colNum % 3 == 0) {
+                                    html += "</tr>";
+                                }
                             }
-                            html += "<td>" + cyDj + "</td>";
-                            if (colNum % 3 == 0) {
-                                html += "</tr>";
+                            var cyDj = prescriptionDetailJson.zyPrescription[0].cyDj;
+                            if (cyDj != null && cyDj != "") {
+                                colNum++;
+                                if (colNum % 3 == 1) {
+                                    html += "<tr>";
+                                }
+                                html += "<td>" + cyDj + "</td>";
+                                if (colNum % 3 == 0) {
+                                    html += "</tr>";
+                                }
                             }
+                            if (index > 0) {
+                                LODOP.NewPageA();
+                            }
+                            if (res.deptName.indexOf("儿") > 0) {
+                                $("#typePrescription").text("儿科");
+                                $("#cfTitle").text("儿科");
+                            } else if (res.deptName.indexOf("急诊科") > 0) {
+                                $("#typePrescription").text("急诊");
+                                $("#cfTitle").text("急诊");
+                            } else {
+                                $("#typePrescription").text("中药处方");
+                                $("#cfTitle").text("普通");
+                            }
+                            $("#prescriptionDetail").html(html);
+                            $("#cfAmountPrint").text(prescriptionDetailJson.zyPrescription[0].amount + "元 ");
+                            LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("prescription_table").innerHTML);
+                            index++;
                         }
-                        if (index > 0) {
-                            LODOP.NewPageA();
-                        }
-                        if (res.deptName.indexOf("儿") > 0) {
-                            $("#typePrescription").text("儿科");
-                            $("#cfTitle").text("儿科");
-                        } else if (res.deptName.indexOf("急诊科") > 0) {
-                            $("#typePrescription").text("急诊");
-                            $("#cfTitle").text("急诊");
-                        } else {
-                            $("#typePrescription").text("中药处方");
-                            $("#cfTitle").text("普通");
-                        }
-                        $("#prescriptionDetail").html(html);
-                        $("#cfAmountPrint").text(prescriptionDetailJson.zyPrescription[0].amount + "元 ");
-                        LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("prescription_table").innerHTML);
-                        index++;
                     }
-                    //诊疗处方
-                    var zlPrescription = prescriptionDetailJson.zlPrescription[0].detail;
-                    if (zlPrescription != null && zlPrescription.length > 0) {
-                        var html = "";
-                        for (var i = 0; i < zlPrescription.length; i++) {
-                            html += "<tr><td>";
-                            html += zlPrescription[i];
-                            html += "</td></tr>";
-                        }
-                        if (index > 0) {
-                            LODOP.NewPageA();
-                        }
-                        if (res.deptName.indexOf("儿") > 0) {
-                            $("#typePrescription").text("儿科");
-                            $("#cfTitle").text("儿科");
-                        } else if (res.deptName.indexOf("急诊科") > 0) {
-                            $("#typePrescription").text("急诊");
-                            $("#cfTitle").text("急诊");
-                        } else {
-                            $("#typePrescription").text("诊疗处方");
-                            $("#cfTitle").text("普通");
+                    if(prescriptionDetailJson.zlPrescription!=null && prescriptionDetailJson.zlPrescription.length>0 ){
+                        //诊疗处方
+                        var zlPrescription = prescriptionDetailJson.zlPrescription[0].detail;
+                        if (zlPrescription != null && zlPrescription.length > 0) {
+                            var html = "";
+                            for (var i = 0; i < zlPrescription.length; i++) {
+                                html += "<tr><td>";
+                                html += zlPrescription[i];
+                                html += "</td></tr>";
+                            }
+                            if (index > 0) {
+                                LODOP.NewPageA();
+                            }
+                            if (res.deptName.indexOf("儿") > 0) {
+                                $("#typePrescription").text("儿科");
+                                $("#cfTitle").text("儿科");
+                            } else if (res.deptName.indexOf("急诊科") > 0) {
+                                $("#typePrescription").text("急诊");
+                                $("#cfTitle").text("急诊");
+                            } else {
+                                $("#typePrescription").text("诊疗处方");
+                                $("#cfTitle").text("普通");
+                            }
+                            $("#prescriptionDetail").html(html);
+                            $("#cfAmountPrint").text(prescriptionDetailJson.zlPrescription[0].amount + "元 ");
+                            LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("prescription_table").innerHTML);
+                            index++;
                         }
-                        $("#prescriptionDetail").html(html);
-                        $("#cfAmountPrint").text(prescriptionDetailJson.zlPrescription[0].amount + "元 ");
-                        LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("prescription_table").innerHTML);
-                        index++;
                     }
-
                     $.ajax({
                         type: "GET",
                         url: '/thmz/getChargeDetailForGuideCard?patientId=' + patientId + '&times=' + times,