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

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

@@ -494,6 +494,7 @@ public class PrescriptionExpressageService extends BaseService {
                        " JOIN wlyy_prescription_pay py ON py.prescription_code = p.`code` " +
                        " WHERE " +
                        " p.patient = '" + p.getCode() + "' " +
                        " AND py.trade_status ='1' " +
                        " AND p.`status`>=50 " +
                        " ORDER BY p.`status` ASC ";
                List<Map<String, Object>> totallist = jdbcTemplate.queryForList(sqlTotal);
@@ -519,7 +520,8 @@ public class PrescriptionExpressageService extends BaseService {
                        " wlyy_prescription p " +
                        " JOIN wlyy_prescription_pay py ON py.prescription_code = p.`code` " +
                        " WHERE " +
                        " p.patient = '" + p.getCode() + "' " +
                        " p.patient = '" + p.getCode() + "'" +
                        " AND py.trade_status ='1' " +
                        " AND p.`status`>=50 " +
                        " ORDER BY p.`status` ASC " +
                        " LIMIT " + start + "," + pageSize;
@@ -631,7 +633,8 @@ public class PrescriptionExpressageService extends BaseService {
                " JOIN wlyy_prescription_pay py ON py.prescription_code = p.`code` " +
                " LEFT JOIN wlyy_prescription_expressage e ON p.code = e.prescription_code" +
                " WHERE" +
                " p.hospital = '"+d.getHospital()+"' ";
                " p.hospital = '"+d.getHospital()+"' " +
                " AND py.trade_status = '1' ";
        totalSql = setSQL( totalSql,keyWord,state,type,startDate,endDate,operator,flag);
        totalSql +=  " AND p.`status`>=50 ";
        List<Map<String, Object>> totallist = jdbcTemplate.queryForList(totalSql);
@@ -662,7 +665,8 @@ public class PrescriptionExpressageService extends BaseService {
                " JOIN wlyy_prescription_pay py ON py.prescription_code = p.`code` " +
                " LEFT JOIN wlyy_prescription_expressage e ON p.code = e.prescription_code" +
                " WHERE" +
                " p.hospital = '"+d.getHospital()+"' ";
                " p.hospital = '"+d.getHospital()+"' " +
                " AND py.trade_status = '1' ";
        sql = setSQL( sql,keyWord,state,type,startDate,endDate,operator,flag);
        sql +=  " AND p.`status`>=50 " +
                " ORDER BY py.charge_time DESC " +
@@ -744,7 +748,8 @@ public class PrescriptionExpressageService extends BaseService {
                " JOIN wlyy_prescription_pay py ON py.prescription_code = p.`code` " +
                " LEFT JOIN wlyy_prescription_expressage e ON p.code = e.prescription_code" +
                " WHERE" +
                " p.hospital = '"+d.getHospital()+"' ";
                " p.hospital = '"+d.getHospital()+"' " +
                " AND py.trade_status = '1' ";
        totalSql = setDrugSQL( totalSql,keyWord,state,type,startDate,endDate,operator,flag);
        totalSql +=  " AND p.`status`>=50 ";
        List<Map<String, Object>> totallist = jdbcTemplate.queryForList(totalSql);
@@ -775,7 +780,8 @@ public class PrescriptionExpressageService extends BaseService {
                " JOIN wlyy_prescription_pay py ON py.prescription_code = p.`code` " +
                " LEFT JOIN wlyy_prescription_expressage e ON p.code = e.prescription_code" +
                " WHERE" +
                " p.hospital = '"+d.getHospital()+"' ";
                " p.hospital = '"+d.getHospital()+"' " +
                " AND py.trade_status = '1' ";
        sql = setDrugSQL( sql,keyWord,state,type,startDate,endDate,operator,flag);
        sql +=  " AND p.`status`>=50 " +
                " ORDER BY e.fetching_medicine_time DESC " +

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/scheme/DoctorSchemeService.java

@@ -1503,7 +1503,8 @@ public class DoctorSchemeService extends BaseService{
    }
    public List<Map<String,Object>> getPatientScheme(String patient,String type){
    public Map<String,Object> getPatientScheme(String patient,String type){
        Map<String,Object> rs = new HashedMap();
        String sql =null;
        if("1".equals(type)){
            sql =  "SELECT " +
@@ -1528,7 +1529,14 @@ public class DoctorSchemeService extends BaseService{
        }
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        return list;
        if(list!=null&&list.size()>0){
            rs.put("code",list.get(0).get("code"));
            rs.put("name",list.get(0).get("name"));
            rs.put("content",list.get(0).get("content"));
            rs.put("list",list);
        }
        return rs;
    }
    public List<Map<String,Object>> getTrackPatientIndexCountList(String doctor,Integer teamCode,String type,String startDate,String endDate,String keyword,Integer page,Integer size){