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

@@ -14496,10 +14496,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                if (StringUtils.isNoneBlank(hospitalSysDictDO2.getDictValue())){
                    com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(hospitalSysDictDO2.getDictValue());
                    String startPm2 = jsonObject.getString("startPm");
                    String endPm2 = jsonObject.getString("endPm");
                    Date startPmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+startPm2);
                    Date endPmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endPm2);
                    String startAm2 = jsonObject.getString("startAm");
                    String endAm2 = jsonObject.getString("endAm");
                    Date startPmDate2 = DateUtil.strToDateLong(DateUtil.getStringDatePre("yyyy-MM-dd","1")+" "+startPm2);
                    Date startAmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+startAm2);
                    Date endAmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endAm2);
                    if (now.getTime()>=startPmDate2.getTime()&&now.getTime()<=endAmDate2.getTime()){
                    if (now.getTime()>=startPmDate2.getTime()&&now.getTime()<=endPmDate2.getTime()){
                        object.put("isAllow","0");//混采1展示0不展示
                    }else if (now.getTime()>=startAmDate2.getTime()&&now.getTime()<=endAmDate2.getTime()){
                        object.put("isAllow","0");//混采1展示0不展示
                    }else {
                        object.put("isAllow","1");//混采1展示0不展示
@@ -14590,10 +14596,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                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 startPmDate2 = DateUtil.strToDateLong(DateUtil.getStringDatePre("yyyy-MM-dd","1")+" "+startPm2);
                    Date startAmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+startAm2);
                    Date endAmDate2 = DateUtil.strToDateLong(DateUtil.getStringDateShort()+" "+endAm2);
                    if (now.getTime()>=startPmDate2.getTime()&&now.getTime()<=endAmDate2.getTime()){
                    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不展示