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

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

@@ -288,7 +288,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " o.description AS description, " +
                " o.disease_img AS diseaseImg, " +
                " o.create_time AS createTime, " +
                " o.`status` AS `status`  " +
                " o.`status` AS `status`," +
                " o.evaluate_status AS evaluateStatus   " +
                " FROM " +
                " wlyy_outpatient o " +
                " WHERE " +

business/base-service/src/main/java/com/yihu/jw/internet/service/DataGeneratorService.java

@@ -161,6 +161,7 @@ public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, I
        outpatientDO.setHospitalName(hospitalDO.getOrgName());
        outpatientDO.setCreateTime(DateUtil.strToDate(date+" 09:30:00"));
        outpatientDO.setConDate(DateUtil.strToDate(date+" 09:30:00"));
        outpatientDO.setAdmDate(DateUtil.strToDate(date+" 09:30:00"));
        outpatientDO.setEndTime(DateUtil.strToDate(date+" 11:30:00"));
        outpatientDO.setRegisterDate(DateUtil.strToDate(date+" 09:20:00"));