Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/healthCare/service/HealthCareService.java

@@ -397,7 +397,7 @@ public class HealthCareService {
        JSONObject data;
        if (StringUtils.isNoneBlank(wxId)){
            if (wxId.equalsIgnoreCase("xm_xzzx_wx"))
            if (wxId.equalsIgnoreCase("xm_xzzx_wx")){}
        }
        //获取his处方信息

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

@@ -14486,10 +14486,31 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    }
    public ObjEnvelop selectNatTime(Integer flag)throws Exception{
        ObjEnvelop envelop = new ObjEnvelop();
        Date now = new Date();
        if (flag!=null&&flag==1){
            com.alibaba.fastjson.JSONObject object = new com.alibaba.fastjson.JSONObject();
            object.put("remainTotal","1");
            object.put("isOpen","1");
            WlyyHospitalSysDictDO hospitalSysDictDO2 = hospitalSysDictDao.findById("natTimeConfig2");
            if (hospitalSysDictDO2!=null){
                if (StringUtils.isNoneBlank(hospitalSysDictDO2.getDictValue())){
                    com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(hospitalSysDictDO2.getDictValue());
                    String startPm2 = jsonObject.getString("startPm");
                    String endAm2 = jsonObject.getString("endAm");
                    Date startPmDate2 = DateUtil.strToDateLong(DateUtil.getStringDatePre("yyyy-MM-dd","1")+" "+startPm2);
                    Date endAmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endAm2);
                    if (now.getTime()>=startPmDate2.getTime()&&now.getTime()<=endAmDate2.getTime()){
                        object.put("isAllow","0");//混采1展示0不展示
                    }else {
                        object.put("isAllow","1");//混采1展示0不展示
                    }
                }else {
                    object.put("isAllow","1");//混采1展示0不展示
                }
            }else {
                object.put("isAllow","1");//混采1展示0不展示
            }
            envelop.setMessage("获取号源成功");
            envelop.setStatus(200);
            envelop.setObj(object);
@@ -14517,7 +14538,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            Date endAmDate = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endAm);
            Date startPmDate = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+startPm);
            Date endPmDate = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endPm);
            Date now = new Date();
            if (i==0){
                if (now.getTime()>=startAmDate.getTime()&&now.getTime()<=endAmDate.getTime()){
                    sql += " and create_time >= '"+DateUtil.dateToStrLong(startAmDate)+"' and create_time <='"+DateUtil.dateToStrLong(endAmDate)+"' ";
@@ -14564,6 +14585,26 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    return envelop;
                }
            }
            WlyyHospitalSysDictDO hospitalSysDictDO2 = hospitalSysDictDao.findById("natTimeConfig2");
            if (hospitalSysDictDO2!=null){
                if (StringUtils.isNoneBlank(hospitalSysDictDO2.getDictValue())){
                    com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(hospitalSysDictDO2.getDictValue());
                    String startPm2 = object.getString("startPm");
                    String endAm2 = object.getString("endAm");
                    Date startPmDate2 = DateUtil.strToDateLong(DateUtil.getStringDatePre("yyyy-MM-dd","1")+" "+startPm2);
                    Date endAmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endAm2);
                    if (now.getTime()>=startPmDate2.getTime()&&now.getTime()<=endAmDate2.getTime()){
                        jsonObject.put("isAllow","0");//混采1展示0不展示
                    }else {
                        jsonObject.put("isAllow","1");//混采1展示0不展示
                    }
                }else {
                    jsonObject.put("isAllow","1");//混采1展示0不展示
                }
            }else {
                jsonObject.put("isAllow","1");//混采1展示0不展示
            }
            envelop.setStatus(200);
            envelop.setMessage("获取号源成功");
            envelop.setObj(jsonObject);

server/svr-authentication/src/main/java/com/yihu/jw/security/service/UserService.java

@@ -37,8 +37,8 @@ public class UserService {
        userDO.setUsername(userDO.getMobile());
        userDO.setName(userDO.getMobile());
        userDO.setSalt(randomString(5));
        userDO.setEnabled(1);
        userDO.setLocked(0);
        userDO.setEnabled(true);
        userDO.setLocked(false);
        userDO.setLoginFailureCount(0);
        String password = userDO.getPassword();
        if (StringUtils.isEmpty(password)) {