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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/file_upload/FileUploadService.java
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

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

@@ -14556,6 +14556,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        String isOpen = null;
        String sql = "SELECT COUNT(1) as count FROM `base_nat_appointment` where is_success = 1 and pay_status=1 ";
        if (hospitalSysDictDO!=null){
            String dictValue = hospitalSysDictDO.getDictValue();
            com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(dictValue);
            String startAm = jsonObject.getString("startAm");
@@ -14572,6 +14573,33 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            Date startPmDate = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+startPm);
            Date endPmDate = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endPm);
            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 endPm2 = object.getString("endPm");
                    Date startPmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+startPm2);
                    Date endPmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endPm2);
                    String startAm2 = object.getString("startAm");
                    String endAm2 = object.getString("endAm");
                    Date startAmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+startAm2);
                    Date endAmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endAm2);
                    if (now.getTime()>=startPmDate2.getTime()&&now.getTime()<=endPmDate2.getTime()){
                        jsonObject.put("isAllow","0");//混采1展示0不展示
                    }else if (now.getTime()>=startAmDate2.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不展示
            }
            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)+"' ";
@@ -14618,32 +14646,7 @@ 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 endPm2 = object.getString("endPm");
                    Date startPmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+startPm2);
                    Date endPmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endPm2);
                    String startAm2 = object.getString("startAm");
                    String endAm2 = object.getString("endAm");
                    Date startAmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+startAm2);
                    Date endAmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endAm2);
                    if (now.getTime()>=startPmDate2.getTime()&&now.getTime()<=endPmDate2.getTime()){
                        jsonObject.put("isAllow","0");//混采1展示0不展示
                    }else if (now.getTime()>=startAmDate2.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);