添加工具类判断节假日

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/HcyyEntranceService.java

@@ -2561,11 +2561,12 @@ public class HcyyEntranceService {
        //处方明细
        String prescriptionItems="";
        for (int i = 0; i < infos.size(); i++) {
            String resId = UUID.randomUUID().toString();
            String prescriptionItem =
                    "        <opt_prescription_item>     \n" +
                    "           <recipe_item_id><![CDATA["+hisId+"]]></recipe_item_id>  \n" +
                    "           <recipe_id><![CDATA["+infos.get(i).getId()+"]]></recipe_id>  \n" +
                    "           <group_no><![CDATA["+infos.get(i).getGroupNo()+"]]></group_no>  \n" +
                    "           <recipe_item_id><![CDATA["+resId+"]]></recipe_item_id>  \n" +
                    "           <recipe_id><![CDATA["+hisId+"]]></recipe_id>  \n" +
                    "           <group_no><![CDATA[1]]></group_no>  \n" +
                    "           <drug_id><![CDATA["+infos.get(i).getHisCode()+"]]></drug_id>  \n" +
                    "           <drug_name><![CDATA["+infos.get(i).getDrugName()+"]]></drug_name>  \n" +
                    "           <specification><![CDATA["+infos.get(i).getSpecification()+"]]></specification>  \n" +
@@ -2578,13 +2579,12 @@ public class HcyyEntranceService {
                    "           <count_unit><![CDATA["+infos.get(i).getPackQuantity()+"]]></count_unit>  \n" +
                    "           <unit_price><![CDATA["+infos.get(i).getPackRetprice()+"]]></unit_price>  \n" +
                    "           <fee_total><![CDATA["+infos.get(i).getPackQuantity() * infos.get(i).getPackRetprice()+"]]></fee_total>  \n" +
                    "           <duration><![CDATA["+infos.get(i).getUsageName()+"]]></duration>  \n" +
                    "           <duration><![CDATA["+infos.get(i).getDays()+"]]></duration>  \n" +
                    "           <preparation><![CDATA["+infos.get(i).getUnitName()+"]]></preparation>  \n" +
                    "           <approve_no><![CDATA["+infos.get(i).getPzwh()+"]]></approve_no>  \n" +
                    "           <medicare_type><![CDATA[]]></medicare_type>  \n" +
                    "           <ouvas_flag><![CDATA[]]></ouvas_flag>  \n" +
                    "           <skin_test_flag><![CDATA[]]></skin_test_flag>  \n" +
                    "           <duration><![CDATA[]]></duration>  \n" +
                    "           <special_prompt><![CDATA[]]></special_prompt>  \n" +
                    "       </opt_prescription_item>  ";
            prescriptionItems += prescriptionItem;
@@ -2592,11 +2592,10 @@ public class HcyyEntranceService {
        //诊断
        String prescriptionDiagnoses="";
        for (int i = 0; i < diagnosisDOS.size(); i++) {
            String diagDate = DateUtil.dateToStrLong(diagnosisDOS.get(i).getCreateTime());
            String prescriptionDiagnose =
                    "   <opt_diagnosis>  \n" +
                    "       <diag_id><![CDATA["+diagnosisDOS.get(i).getId()+"]]></diag_id>  \n" +
                    "       <diag_date><![CDATA["+diagDate+"]]></diag_date>  \n" +
                    "       <diag_date><![CDATA["+eventTime+"]]></diag_date>  \n" +
                    "       <diag_name><![CDATA["+diagnosisDOS.get(i).getName()+"]]></diag_name>  \n" +
                    "       <diag_code><![CDATA["+diagnosisDOS.get(i).getCode()+"]]></diag_code>  \n" +
                    "       <diag_status><![CDATA[0]]></diag_status>  \n" +

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -430,11 +430,11 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            //账户密码登录的才验证密码强度
        String grant_type = parameters.get("grant_type");
        if ("password".equals(grant_type)) {
        /*if ("password".equals(grant_type)) {
            if (!testPwd(parameters.get("password"))) {
                throw new PwdException("密码强度低，请用验证码登录，或者修改密码后在从新登录！");
            }
        }
        }*/
        /*如果是移动端登陆则移除之前的token，
        在网关处通过HTTP状态码告知前端是过期（402）还是账号在别处登陆（403），