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

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

@@ -511,7 +511,7 @@ public class PrescriptionInfoService extends BaseService {
        return 1;
    }
    public JSONArray getDoctorPrescription(Integer teamCode, String state, String diseases, String startDate, String endDate, String nameKeyword, String patient, Integer page, Integer size) {
    public List<Map<String, Object>> getDoctorPrescription(Integer teamCode, String state, String diseases, String startDate, String endDate, String nameKeyword, String patient, Integer page, Integer size) {
        StringBuffer pre_sql = new StringBuffer("SELECT " +
                " p.`name`, " +
                " TIMESTAMPDIFF(YEAR,p.birthday,SYSDATE()) age, " +
@@ -548,7 +548,7 @@ public class PrescriptionInfoService extends BaseService {
            map.put("prescriptionInfo", prescriptionDiagnosisService.getPrescriptionInfo(code));
            map.put("prescriptionDt", prescriptionDiagnosisService.getPrescriptionDiagnosis(code));
        }
        return new JSONArray(rs);
        return rs;
    }
    public void setSQL(StringBuffer pre_sql, List<Object> params, Integer teamCode, String state, String startDate, String endDate, String nameKeyword, String patient, Integer page, Integer size) {
@@ -1059,9 +1059,9 @@ public class PrescriptionInfoService extends BaseService {
        states.add(map4);
        Map<String, Object> map5 = new HashMap<>();
        map2.put("name", "已完成");
        map2.put("code", PrescriptionLog.PrescriptionLogStatus.finish.getValue());
        states.add(map2);
        map5.put("name", "已完成");
        map5.put("code", PrescriptionLog.PrescriptionLogStatus.finish.getValue());
        states.add(map5);
        //设置配送状态下拉框
        rs.put("states", states);
        //
@@ -1271,7 +1271,7 @@ public class PrescriptionInfoService extends BaseService {
            }
        }
        pre_sql.append(" ORDER BY r.reviewed_time DESC ");
        pre_sql.append(" ORDER BY pr.dispensary_type DESC,e.expressage_code ASC,r.reviewed_time DESC ");
        if (page != null && size != null) {
            pre_sql.append(" LIMIT " + (page - 1) * size + "," + size);
        }