Merge remote-tracking branch 'upstream/dev-1.1.4' into dev-1.1.4

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

@@ -2045,10 +2045,10 @@ public class MzChargeDetailController {
                     if (Arrays.asList(Constants.TC, Constants.SSWRF).contains(mz.getBillItemCode())) {
                         continue;
                     }
-                    Map<String, Object> map = tempMap.get(mz.getBillItemCode());
+                    Map<String, Object> map = tempMap.get(mz.getBillItemCode()+mz.getExecDept());
                     if (map == null) {
                         map = new HashMap<>();
-                        tempMap.put(mz.getBillItemCode(), map);
+                        tempMap.put(mz.getBillItemCode()+mz.getExecDept(), map);
                         returnList.add(map);
                         if (mzBillItemMap != null) {
                             map.put("itemType", mzBillItemMap.get(mz.getBillItemCode()));

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

@@ -10981,7 +10981,7 @@ function getTz(mzBlRecord) {
         }
     }
     if (mzBlRecord.pressureHigh != null && mzBlRecord.pressureFloor != null && mzBlRecord.pressureHigh != 0 && mzBlRecord.pressureFloor != 0) {
-        var temp = "血压：" + mzBlRecord.pressureHigh + "/" + mzBlRecord.pressureFloor;
+        var temp = "血压：" + mzBlRecord.pressureHigh + "/" + mzBlRecord.pressureFloor + " mmhg";
         if (tz == null) {
             tz = temp;
         } else {

src/main/resources/templates/mz/clinic.html

@@ -2670,6 +2670,12 @@
             <tr>
                 <td colspan="2">请缴费后至以上科室取药或检查治疗，检查完成后可关注服务号查询结果。</td>
             </tr>
+            <tr>
+                <td colspan="2">急诊科加急检验，请于急诊导诊台抽血。</td>
+            </tr>
+            <tr>
+                <td colspan="2">急诊科B超，8：00-17：30请前往五楼超声影影像科检查，其他时间在急诊科B超室。</td>
+            </tr>
             </tbody>
         </table>
         <div id="payQrcodeGuideCard" style="width: 100px;height: 100px;margin-top:10px;float: left"></div>