儿童优化

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

@@ -1705,7 +1705,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     if (setUnitPrice && birthDay != null) {
                         int age = DateUtil.getAge(birthDay);
                         //6岁以内的小朋友费用上调50% 根据【湘医保发〔2020〕51 号】价格通知，6岁以内的小朋友费用上调50%!
-                        if (age < 6) {
+                        if (age <= 6) {
                             ZdChargeItem zdChargeItem = zdChargeItemService.queryZdChargeItemByCode(mzChargeDetail.getChargeItemCode());
                             if (zdChargeItem != null) {
                                 //项目加价且加收比例不为空
@@ -2169,7 +2169,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         if (setUnitPrice && tempZdChargeItem.getCo() != null && YesNoEnum.YES.code.equals(tempZdChargeItem.getCo()) && tempZdChargeItem.getXlCode() != null && StringUtils.isNotBlank(tempZdChargeItem.getXlCode()) && birthDay != null) {
             int age = DateUtil.getAge(birthDay);
             //6岁以内的小朋友费用上调50% 根据【湘医保发〔2020〕51 号】价格通知，6岁以内的小朋友费用上调50%!
-            if (age < 6) {
+            if (age <= 6) {
                 BigDecimal xlCode = new BigDecimal(tempZdChargeItem.getXlCode());
                 if (xlCode != null) {
                     xlCode = xlCode.add(BigDecimal.ONE);
@@ -2200,7 +2200,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         if (setUnitPrice && mzPatientMi != null && mzPatientMi.getBirthDay() != null && zdChargeItem.getCo() != null && YesNoEnum.YES.code.equals(zdChargeItem.getCo()) && zdChargeItem.getXlCode() != null && StringUtils.isNotBlank(zdChargeItem.getXlCode())) {
             int age = DateUtil.getAge(mzPatientMi.getBirthDay());
             //6岁以内的小朋友费用上调50% 根据【湘医保发〔2020〕51 号】价格通知，6岁以内的小朋友费用上调50%!
-            if (age < 6) {
+            if (age <= 6) {
                 BigDecimal xlCode = new BigDecimal(zdChargeItem.getXlCode());
                 if (xlCode != null) {
                     xlCode = xlCode.add(BigDecimal.ONE);

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

@@ -550,7 +550,7 @@ public class MzyRequestServiceImpl implements MzyRequestService {
         if (birthDay != null) {
             int age = DateUtil.getAge(birthDay);
             //6岁以内的小朋友挂号费上调50%
-            if (age < 6) {
+            if (age <= 6) {
                 if (mzyZdChargeType.getReqFee() != null) {
                     checkFee = checkFee.add(mzyZdChargeType.getReqFee());
                 }

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

@@ -5129,7 +5129,7 @@ function editZlItem(obj) {
 function saveJyJcItem(calculateTotalAmountFlag) {
     //6岁内提示加价
     var patientAge = $("#patientAge").text();
-    if (calculateTotalAmountFlag && patientAge != null && patientAge != "" && patientAge < 6) {
+    if (calculateTotalAmountFlag && patientAge != null && patientAge != "" && patientAge <= 6) {
         $.ajax({
             type: "GET",
             url: '/thmz/checkAdditionally?code=' + $("#jcjy_current_code").val() + "&jcJyZltype=" + $("#jcJyZltype").val(),
@@ -5328,7 +5328,7 @@ function saveJyJcItemReal(calculateTotalAmountFlag) {
 function saveZlItem(calculateTotalAmountFlag) {
     //6岁内提示加价
     var patientAge = $("#patientAge").text();
-    if (calculateTotalAmountFlag && patientAge != null && patientAge != "" && patientAge < 6) {
+    if (calculateTotalAmountFlag && patientAge != null && patientAge != "" && patientAge <= 6) {
         $.ajax({
             type: "GET",
             url: '/thmz/checkAdditionally?code=' + $("#zl_current_code").val() + "&jcJyZltype=3",