Merge branch 'dev' of trick9191/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/Prescription.java

@@ -680,7 +680,7 @@ public class Prescription extends IdEntity {
    public void setMinDrugDay(Integer minDrugDay) {
        this.minDrugDay = minDrugDay;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getPresCreateTime() {
        return presCreateTime;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -578,9 +578,9 @@ public class PrescriptionInfoService extends BaseService {
        }
        //排序
        if(StringUtils.isNotBlank(state)&&"0,2,3,4,10".equals(state)){
            pre_sql.append(" GROUP BY pr.code ORDER BY pr.min_drug_day-TIMESTAMPDIFF(DAY, pr.pres_create_time, NOW()),pr.create_time ASC");
            pre_sql.append(" GROUP BY pr.code ORDER BY pr.min_drug_day-TIMESTAMPDIFF(DAY, pr.pres_create_time, NOW()) ASC");
        }else{
            pre_sql.append(" GROUP BY pr.code ORDER BY pr.create_time ASC");
            pre_sql.append(" GROUP BY pr.code ORDER BY pr.create_time DESC");
        }
        if (page != null && page > 0 && size != null && size > 0) {