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

@@ -94,7 +94,7 @@ public class PrescriptionInfoService extends BaseService {
    private static final Logger logger = LoggerFactory.getLogger(HttpUtil.class);
    /**
     * 获取处方下的详细药品
     * 获取处方下的详细药品列表
     *
     * @param prescriptionCode
     * @return
@@ -1209,7 +1209,7 @@ public class PrescriptionInfoService extends BaseService {
        return new JSONArray(rs);
    }
    public JSONArray getPhysicInfo(String code) {
    public List<Map<String, Object>> getPhysicInfo(String code) {
        StringBuffer sql = new StringBuffer("SELECT " +
                " t.min_dose AS minDose, " +
                " t.physic_code AS physicCode, " +
@@ -1218,8 +1218,9 @@ public class PrescriptionInfoService extends BaseService {
                " com1.`name` AS doseUnitName, " +
                " t.quantity_unit AS quantityUnit, " +
                " com2.`name` AS quantityUnitName, " +
                " t.pack_unit As pack_unit, " +
                " com3.`name` As packUnitName " +
                " t.pack_unit As packUnit, " +
                " com3.`name` As packUnitName, " +
                " pack_spec AS packSpec" +
                " FROM " +
                " zy_iv_physic_dict t, " +
                " (SELECT code,name FROM zy_common_dict WHERE dict_name = 'IV_MEASURE_UNIT_DICT') com1, " +
@@ -1231,6 +1232,6 @@ public class PrescriptionInfoService extends BaseService {
                " AND com3.`code` = t.pack_unit   " +
                " AND t.physic_code = ?");
        List<Map<String, Object>> rs = jdbcTemplate.queryForList(sql.toString(),new Object[]{code});
        return new JSONArray(rs);
        return rs;
    }
}