代码优化手机号码

src/main/java/cn/hnthyy/thmz/Utils/StringUtil.java

@@ -195,7 +195,7 @@ public class StringUtil {
      * @return
      */
     public static String isPhone(String phone) {
-        String regex = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[1|8|9]))\\d{8}$";
+        String regex = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,2,1,3,5,6,7,8])|(18[0-9])|(19[1|8|9]))\\d{8}$";
         if (phone.length() != 11) {
             return "手机号应为11位数";
         } else {

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

@@ -2065,6 +2065,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                 newMzChargeDetail.setGlPercentFt(BigDecimal.ONE);
                 newMzChargeDetail.setOrigPrice(newMzChargeDetail.getUnitPrice());
                 newMzChargeDetail.setTcName("四舍五入");
+                newMzChargeDetail.setReqYj(YesNoEnum.YES.code.toString());
                 mzChargeDetails.add(newMzChargeDetail);
             }
         }
@@ -2153,6 +2154,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             newMzChargeDetail.setSelfFlag(YesNoEnum.NO.code.toString());
             newMzChargeDetail.setResponceType(mzPatientMi != null ? mzPatientMi.getResponseType() : ResponceTypeEnum.SELF_PAYING.code);
             newMzChargeDetail.setGlPercentFt(BigDecimal.ONE);
+            newMzChargeDetail.setReqYj(YesNoEnum.YES.code.toString());
             mzChargeDetails.add(newMzChargeDetail);
         }
         return itemNo;
@@ -2233,6 +2235,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             newMzChargeDetail.setSelfFlag(YesNoEnum.NO.code.toString());
             newMzChargeDetail.setResponceType(mzPatientMi != null ? mzPatientMi.getResponseType() : ResponceTypeEnum.SELF_PAYING.code);
             newMzChargeDetail.setGlPercentFt(BigDecimal.ONE);
+            newMzChargeDetail.setReqYj(YesNoEnum.YES.code.toString());
             mzChargeDetails.add(newMzChargeDetail);
             vesselSets.add(jyZdItem.getVessel());
         }
@@ -2296,7 +2299,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                             newMzChargeDetail.setOrderDays(null);
                             newMzChargeDetail.setPaySelf(null);
                             newMzChargeDetail.setTryFlag(null);
-                            newMzChargeDetail.setReqYj(null);
+                            newMzChargeDetail.setReqYj(YesNoEnum.YES.code.toString());
                             newMzChargeDetail.setOrigPrice(zdChargeItem.getChargeAmount());
                             String temp = newMzChargeDetail.getOrderNo().toString();
                             Integer itemNoTemp = itemNo - 100;
@@ -2384,6 +2387,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         newMzChargeDetail.setResponceType(mzPatientMi != null ? mzPatientMi.getResponseType() : ResponceTypeEnum.SELF_PAYING.code);
         newMzChargeDetail.setGlPercentFt(BigDecimal.ONE);
         newMzChargeDetail.setOrigPrice(BigDecimal.ZERO);
+        newMzChargeDetail.setReqYj(YesNoEnum.YES.code.toString());
         mzChargeDetails.add(newMzChargeDetail);
         if (ReqTypeEnum.JIAN_YAN.code.equals(mzYjReq.getReqType())) {
             jianYans.add(mzYjReq.getOrderCode());
@@ -2469,6 +2473,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         newMzChargeDetail.setResponceType(mzPatientMi != null ? mzPatientMi.getResponseType() : ResponceTypeEnum.SELF_PAYING.code);
         newMzChargeDetail.setGlPercentFt(BigDecimal.ONE);
         newMzChargeDetail.setOrigPrice(zdChargeItem.getChargeAmount());
+        newMzChargeDetail.setReqYj(YesNoEnum.YES.code.toString());
         mzChargeDetails.add(newMzChargeDetail);
         return itemNo;
     }