|
@ -103,6 +103,7 @@ import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.boot.Banner;
|
|
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
import org.springframework.jdbc.core.BeanPropertyRowMapper;
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
@ -8752,7 +8753,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
if(StringUtils.isNotBlank(checkStatus)){
|
|
|
sql+=" and p.check_status ="+checkStatus;
|
|
|
}
|
|
|
wechatId = "12";
|
|
|
if(StringUtils.isNotBlank(startTime)){
|
|
|
if("xm_ykyy_wx".equals(wechatId)){
|
|
|
if (flag){
|
|
@ -8786,7 +8786,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
List<Map<String,Object>> resultList = hibenateUtils.createSQLQuery(sql,page,pageSize);
|
|
|
for (Map<String,Object> map:resultList){
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
map.put("createTime",null==map.get("createTime")?"":sdf.format(new Date(Long.parseLong(map.get("createTime").toString()))));
|
|
|
map.put("createTime",null==map.get("createTime")?"":DateUtil.dateToStrLong(DateUtil.strToDateLong(map.get("createTime").toString())));
|
|
|
}
|
|
|
MixEnvelop mixEnvelop = new MixEnvelop();
|
|
|
mixEnvelop.setDetailModelList(resultList);
|