门诊处方打印皮试结果

src/main/java/cn/hnthyy/thmz/entity/his/mz/MzChargeDetail.java

@@ -11,6 +11,14 @@ import java.util.Date;
  */
 @Data
 public class MzChargeDetail implements Serializable,Comparable<MzChargeDetail> {
+    /**
+     * 皮试结果 阴性
+     */
+    public final static String NEGATIVE_TRY_RESULT="0";
+    /**
+     * 皮试结果 免试
+     */
+    public final static String EXCUSED_EXAMINATION_TRY_RESULT="3";
     //病人ID码
     private String patientId;
     //次数

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

@@ -1353,7 +1353,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         continue;
                     }
                     //暂时不做限制，太多的给药方式是诊疗
-                    if (supplyChargeItemCodeSet == null && supplyCodeList.size()>0) {
+                    if (supplyChargeItemCodeSet == null && supplyCodeList.size() > 0) {
                         List<MzZdSupplyCharge> mzZdSupplyChargeList = mzZdSupplyChargeService.queryMzZdSupplyChargeByCodeList(supplyCodeList);
                         //List<MzZdSupplyCharge> mzZdSupplyChargeList = mzZdSupplyChargeService.queryMzZdSupplyChargeByCodeList(mzZdSupplyTypeMapper.selectMzZdSupplyTypeCodeInUsed());
                         if (mzZdSupplyChargeList != null && mzZdSupplyChargeList.size() > 0) {
@@ -1482,6 +1482,13 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     if (StringUtils.isNotBlank(mzChargeDetail.getTryFlag()) && YesNoEnum.YES.code.toString().equals(mzChargeDetail.getTryFlag())) {
                         xyDetail.put("tryFlag", "皮试");
                     }
+                    if (StringUtils.isNotBlank(mzChargeDetail.getTryResult())) {
+                        if (MzChargeDetail.NEGATIVE_TRY_RESULT.equals(mzChargeDetail.getTryResult())) {
+                            xyDetail.put("tryResult", "阴性");
+                        } else if (MzChargeDetail.EXCUSED_EXAMINATION_TRY_RESULT.equals(mzChargeDetail.getTryResult())) {
+                            xyDetail.put("tryResult", "免试");
+                        }
+                    }
                     if (StringUtils.isNotBlank(mzChargeDetail.getInstructionText())) {
                         xyDetail.put("instructionCode", mzChargeDetail.getInstructionCode());
                         xyDetail.put("instructionText", mzChargeDetail.getInstructionText());
@@ -1799,7 +1806,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                                 .append(detailMap.get("drugQuan") == null ? "" : detailMap.get("drugQuan"))
                                 .append(detailMap.get("unitDesc"))
                                 .append(" 频次： ")
-                                .append(detailMap.get("frequency") == null ? "" : detailMap.get("frequency")).append(" ").append(detailMap.get("orderDays") == null ? "" : detailMap.get("orderDays")).append("天</br>");
+                                .append(detailMap.get("frequency") == null ? "" : detailMap.get("frequency")).append(" ").append(detailMap.get("orderDays") == null ? "" : detailMap.get("orderDays")).append("天 ")
+                                .append(detailMap.get("tryFlag") == null ? "" : detailMap.get("tryFlag")).append(" ").append(detailMap.get("tryResult") == null ? "" : detailMap.get("tryResult")).append("</br>");
                     }
                 }
             }
@@ -3523,12 +3531,12 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             Map<String, Integer> chargeItemCountMap = new HashMap<>();
             for (MzChargeDetail md : newMzChargeDetailList) {
                 if (Constants.TC.equals(md.getBillItemCode())) {
-                    List<MzChargeDetail> mdList=chargeItemMap.get(md.getChargeItemCode());
-                    if(mdList==null){
-                        mdList=new ArrayList<>();
+                    List<MzChargeDetail> mdList = chargeItemMap.get(md.getChargeItemCode());
+                    if (mdList == null) {
+                        mdList = new ArrayList<>();
                     }
                     mdList.add(md);
-                    chargeItemMap.put(md.getChargeItemCode(),mdList);
+                    chargeItemMap.put(md.getChargeItemCode(), mdList);
                 } else if (StringUtils.isNotBlank(md.getTcNo())) {
                     Integer count = chargeItemCountMap.get(md.getTcNo());
                     if (count == null) {

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

@@ -474,7 +474,7 @@ $(function () {
                         var tableData = $("#tb_table_western_medicine").bootstrapTable('getData');
                         if (tableData != null && tableData.length > 0 && dataIndex != null) {
                             var trData = tableData[dataIndex];
-                            checkYpInfo(trData.code, trData.serial, trData.ypType, true,null);
+                            checkYpInfo(trData.code, trData.serial, trData.ypType, true, null);
                             $("#western_medicine_name").click();
                         }
                     } else {
@@ -1923,7 +1923,13 @@ function fitxyContent(pyPrescription, contentId, titleId, checkBox) {
                 xypyHtml += pyDetail.frequency;
                 xypyHtml += " ";
                 xypyHtml += pyDetail.orderDays;
-                xypyHtml += "天";
+                xypyHtml += "天 ";
+                if (pyDetail.tryResult != undefined && pyDetail.tryResult != null && pyDetail.tryResult != "null" && pyDetail.tryResult != "") {
+                    xypyHtml += pyDetail.tryResult;
+                }
+                if (pyDetail.tryFlag != undefined && pyDetail.tryFlag != null && pyDetail.tryFlag != "null" && pyDetail.tryFlag != "") {
+                    xypyHtml += pyDetail.tryFlag;
+                }
                 if (checkBox) {
                     xypyHtml += "</span>";
                 }
@@ -2483,14 +2489,14 @@ function editPrescription(jsonData, type) {
                     groupOrder = 1;
                 }
                 var lastGroupOrder = parseInt($("#groupId > option:last").val());
-                while (lastGroupOrder<groupOrder) {
+                while (lastGroupOrder < groupOrder) {
                     appendGroupOrder();
                 }
                 appendGroupOrder()
                 $("#groupId").selectpicker('val', groupOrder);
                 $('#groupId').selectpicker('refresh');
 
-                checkYpInfo(code, serial, groupNo, false,mzChargeDetail.orderNo);
+                checkYpInfo(code, serial, groupNo, false, mzChargeDetail.orderNo);
                 // 给药方式 同组药品给药方式相同
                 $("#supplyType").selectpicker('val', mzChargeDetail.supplyCode);
                 $('#supplyType').selectpicker('refresh');
@@ -2508,7 +2514,7 @@ function editPrescription(jsonData, type) {
                 } else {
                     $("#tryFlag").parent().removeClass("checked");
                 }
-                if(mzChargeDetail.tryResult!=null && mzChargeDetail.tryResult!="null" && mzChargeDetail.tryResult!=""){
+                if (mzChargeDetail.tryResult != null && mzChargeDetail.tryResult != "null" && mzChargeDetail.tryResult != "") {
                     $("#tryResult").selectpicker('val', mzChargeDetail.tryResult);
                     $('#tryResult').selectpicker('refresh');
                 }
@@ -3350,8 +3356,8 @@ function saveWesternMedicine(calculateTotalAmountFlag) {
     if (tryFlag == "true" || tryFlag == true) {
         html += '皮试 ';
     }
-    if (tryResult != null && tryResult != 'null' && tryResult!="") {
-        html += '皮试结果： '+$('#tryResult option:selected').text();
+    if (tryResult != null && tryResult != 'null' && tryResult != "") {
+        html += '皮试结果： ' + $('#tryResult option:selected').text();
     }
     if (medicalAdvice != null && medicalAdvice != '') {
         html += '医嘱:' + medicalAdviceText;
@@ -5531,7 +5537,7 @@ function loadYpList(index, event) {
         onClickRow: function (row, $element) {
             $('#' + MedicineName).webuiPopover('hide');
             if (index == 0) {
-                checkYpInfo(row.code, row.serial, row.ypType, true,null);
+                checkYpInfo(row.code, row.serial, row.ypType, true, null);
             }
             if (index == 1) {
                 checkZyInfo(row.code, row.serial, true);
@@ -5549,7 +5555,7 @@ function loadYpList(index, event) {
  * @param needNotice 是否需要提示 当用户操作的时候 true 需要提示， 范文和处方回写的时候false不需要提示
  * @param orderNo 处方号，回写的时候需要用，因为有的处方没有满5个
  */
-function checkYpInfo(code, serial, groupNo, needNotice,orderNo) {
+function checkYpInfo(code, serial, groupNo, needNotice, orderNo) {
     //判断是否有重复的项目  返回true 说明有重复的
     if (verifyRepeat(code, serial, null, 0)) {
         return;
@@ -5653,16 +5659,16 @@ function checkYpInfo(code, serial, groupNo, needNotice,orderNo) {
                         //当前编辑的处方非普通西药处方
                     } else {
                         //修改药品
-                        if(orderNo!=null){
+                        if (orderNo != null) {
                             //西药处方数量
-                            var xyTabLiLength=$("#xyTab li").length;
-                            if(xyTabLiLength<orderNo){
+                            var xyTabLiLength = $("#xyTab li").length;
+                            if (xyTabLiLength < orderNo) {
                                 refreshNavTabs(0, groupNo);
-                            }else {
+                            } else {
                                 $("#xyTab li.active").find("a").find("small.cfdesc").text("(" + cfdesc + ")");
                             }
                             fitWesternMedicine(res, groupNo);
-                        }else {
+                        } else {
                             $("#xyTab li.active").find("a").find("small.cfdesc").text("(" + cfdesc + ")");
                             fitWesternMedicine(res, groupNo);
                         }
@@ -7225,7 +7231,7 @@ function getParamsForpPrescription(type) {
                     if (tryFlag == true || tryFlag == "true") {
                         tempJson.tryFlag = 1;
                     }
-                    tempJson.tryResult=$(formGroups[j]).find("input.temporary_items_tryResult").val();
+                    tempJson.tryResult = $(formGroups[j]).find("input.temporary_items_tryResult").val();
                     jsonData.mzChargeDetailList[jsonData.mzChargeDetailList.length] = tempJson;
                 }
             }
@@ -8131,7 +8137,15 @@ function setTableHtml(prescriptionDetail) {
         html += "<td>X</td>";
         html += "<td>" + detail.quantity + detail.packUnit + "</td>";
         html += "</tr>";
-        html += "<tr><td></td><td></td>";
+        html += "<tr><td></td>";
+        if (detail.tryResult != undefined && detail.tryResult != null && detail.tryResult != "null" && detail.tryResult != "") {
+            html += "<td>" + detail.tryResult+"</td>";
+        }else if (detail.tryFlag != undefined && detail.tryFlag != null && detail.tryFlag != "null" && detail.tryFlag != "") {
+            html += "<td>"  + detail.tryFlag+"</td>";
+        }else {
+            html+="<td></td>";
+        }
+        //html +="<td></td>";
         html += "<td style='font-weight: bold;text-align: right;'>用法：</td>";
         html += "<td>" + detail.drugQuan + detail.unitDesc + "/次</td>";
         html += "<td>" + detail.frequency + "</td>";