儿科挂号不加收

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

@@ -549,18 +549,18 @@ public class MzyRequestServiceImpl implements MzyRequestService {
         mzyZdChargeType.setOthFee(checkFee);
         if (birthDay != null) {
             int age = DateUtil.getAge(birthDay);
-            //6岁以内的小朋友挂号费上调50%
-            if (age <= 6 && !(StrUtil.isNotBlank(patientId) && shareholderCardService.checkGhDiscount(patientId))) {
-                if (mzyZdChargeType.getReqFee() != null) {
-                    checkFee = checkFee.add(mzyZdChargeType.getReqFee());
-                }
-                if (mzyZdChargeType.getClinicFee() != null) {
-                    checkFee = checkFee.add(mzyZdChargeType.getClinicFee());
-                }
-                BigDecimal tempFee = checkFee.multiply(BigDecimal.valueOf(0.5));
-                mzyZdChargeType.setOthFee(mzyZdChargeType.getOthFee().add(tempFee));
-                mzyZdChargeType.setMessage("根据【湘医保发〔2020〕51 号】价格通知，不满7周岁的儿童挂号费上调50%!");
-            }
+//            //6岁以内的小朋友挂号费上调50%
+//            if (age <= 6 && !(StrUtil.isNotBlank(patientId) && shareholderCardService.checkGhDiscount(patientId))) {
+//                if (mzyZdChargeType.getReqFee() != null) {
+//                    checkFee = checkFee.add(mzyZdChargeType.getReqFee());
+//                }
+//                if (mzyZdChargeType.getClinicFee() != null) {
+//                    checkFee = checkFee.add(mzyZdChargeType.getClinicFee());
+//                }
+//                BigDecimal tempFee = checkFee.multiply(BigDecimal.valueOf(0.5));
+//                mzyZdChargeType.setOthFee(mzyZdChargeType.getOthFee().add(tempFee));
+//                mzyZdChargeType.setMessage("根据【湘医保发〔2020〕51 号】价格通知，不满7周岁的儿童挂号费上调50%!");
+//            }
         }
         //看病人身份是是否有挂号优惠
         if(StrUtil.isNotBlank(patientId) && !Constants.TSMZ_CODE.equals(mzyRequest.getUnitCode()) && shareholderCardService.checkGhDiscount(patientId)){

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

@@ -758,10 +758,13 @@ var zdChargeMap;
 function initChargeItemSelect(){
     //初始化收费类别
     $.ajax({
-        type: "GET",
-        url: '/thmz/getZdChargeItemByMz',
-        dataType: "json",
-        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+
+        type: "POST",
+        contentType: "application/json;charset=UTF-8",
+        url: "/thmz/listZdChargeItem/",
+        dataType: 'json',
+        data: JSON.stringify({"pageSize":5000,"pageIndex":0,"zdChargeItem":{"name":"","classCode":"","auditCode":"001","billItemMz":"","billItemZy":"","delFlag":""}}),
+        headers:{'Accept': 'application/json','Authorization':'Bearer '+ localStorage.getItem("token")},
         success: function (res) {
             if (res == '401' || res == 401) {
                 window.location.href = '/thmz/login/view'