三院患者诊前档案开发

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

@@ -1311,7 +1311,7 @@ public class DsyyEntranceService {
        if (StringUtils.isNoneBlank(chargeCode)){
            sql+=" and charge_code = '"+chargeCode+"' ";
        }
        sql +=" and group_no ='50105' ";
        sql +=" and visible_flag=0 and stock_amount!=0 and group_no ='50105' ";
        JSONArray array = new JSONArray();
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);

business/base-service/src/main/java/com/yihu/jw/patient/service/PatientPreDiagnosisInfoService.java

@@ -77,16 +77,16 @@ public class PatientPreDiagnosisInfoService extends BaseJpaService<PatientPreDia
            filter += " and from_source = '"+fromSource+"' ";
        }
        if(StringUtils.isNotBlank(systolicPressureStart)){
            filter += " and systolic_pressure >= '"+systolicPressureStart+"' ";
            filter += " and systolic_pressure >= "+systolicPressureStart+" ";
        }
        if(StringUtils.isNotBlank(systolicPressureEnd)){
            filter += " and systolic_pressure <= '"+systolicPressureEnd+"' ";
            filter += " and systolic_pressure <= "+systolicPressureEnd+" ";
        }
        if(StringUtils.isNotBlank(diastolicPressureStart)){
            filter += " and diastolic_pressure >= '"+diastolicPressureStart+"' ";
            filter += " and diastolic_pressure >= "+diastolicPressureStart+" ";
        }
        if(StringUtils.isNotBlank(diastolicPressureEnd)){
            filter += " and diastolic_pressure <= '"+diastolicPressureEnd+"' ";
            filter += " and diastolic_pressure <= "+diastolicPressureEnd+" ";
        }
        if(StringUtils.isNotBlank(startTime)){
            filter += " and create_time >= '"+startTime+"' ";

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

@@ -4929,9 +4929,9 @@ public class ImService {
            } else if (type.equalsIgnoreCase("2")) {
                sql += " AND op.outpatient_type = 2";
            } else if (type.equalsIgnoreCase("3")) {
                sql += " AND  op.outpatient_type = 3";
                sql += " AND ( op.outpatient_type = 3 or op.outpatient_type=5 )";
            } else {
                sql += " AND op.outpatient_type in (1,2,3) ";
                sql += " AND op.outpatient_type in (1,2,3,5) ";
            }
        }
        sql += " order by op.create_time  desc ";
@@ -4983,7 +4983,7 @@ public class ImService {
                    sql += " AND op.outpatient_type = 2";
                    mapKey = "xtNum";
                } else if (outpatientType[i].equalsIgnoreCase("3")) {
                    sql += " AND  op.outpatient_type = 3";
                    sql += " AND  (op.outpatient_type = 3 or op.outpatient_type = 5) ";
                    mapKey = "zxNum";
                } else {
                    sql += " AND op.outpatient_type in (1,2,3) ";