修改

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -4376,7 +4376,7 @@ public class ImService {
    }
    public MixEnvelop recordByDoctor(String doctor, String id,String type, Integer status,String title, String start_time, String end_time, String patient) { //
    public MixEnvelop recordByDoctor(String doctor, String id,String type, Integer status,String title, String start_time, String end_time, String patient,String hospital) { //
        String sql = "";
        sql ="SELECT\n" +
                        "\ta.patient_name AS \"pname\",\n" +
@@ -4412,7 +4412,9 @@ public class ImService {
        } else {
            sql += " and a.status = " + status;
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(hospital)) {
            sql += " AND a.hospital ='" + hospital + "' ";
        }
        if (org.apache.commons.lang.StringUtils.isNotBlank(doctor)) {
            sql += " AND a.doctor='" + doctor + "' ";
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -1083,10 +1083,12 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                         @RequestParam(value = "start_time",required = false) String start_time,
                                     @ApiParam(name = "end_time", value = "结束时间 YYYY-MM-DD HH:MM:SS")
                                         @RequestParam(value = "end_time",required = false) String end_time,
                                     @ApiParam(name = "hospital", value = "")
                                         @RequestParam(value = "hospital",required = false) String hospital,
            HttpServletResponse response) throws Exception {
        try{
            MixEnvelop expressages = imService.recordByDoctor(doctor, id, type, status, title, start_time, end_time, patient);//
            MixEnvelop expressages = imService.recordByDoctor(doctor, id, type, status, title, start_time, end_time, patient,hospital);//
            List<Map<String, Object>> list = expressages.getDetailModelList();
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename=" + new String("searchRecordWrite.xls"));