Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/ZyDictService.java

@@ -77,27 +77,17 @@ public class ZyDictService {
                " yp.physic_name drugName, " +
                " yp.physic_spec drugFormat, " +
                " yp.subject_class subjectClass, " +
                " yp.pack_unit packUnit, " +
                " yp.min_dose minDose, " +
                " yp.pake_spec pakeSpec, " +
                " class.class_name className, " +
                " yp.dose_unit physicDoseUnit, " +
                " com1.`name` physicDoseUnitName, " +
                " yp.quantity_unit drugNumUnit, " +
                " com2.`name` drugNumUnitName " +
                " FROM " +
                " ( " +
                "   SELECT " +
                "   * " +
                "   FROM " +
                "  zy_common_dict " +
                "   WHERE " +
                "    dict_name = 'IV_MEASURE_UNIT_DICT' " +
                " ) com1, " +
                " ( " +
                "   SELECT " +
                "    * " +
                "    FROM  " +
                "    zy_common_dict  " +
                "    WHERE " +
                "    dict_name = 'IV_MEASURE_UNIT_DICT' " +
                "  ) com2, " +
                " (SELECT code,name FROM zy_common_dict WHERE dict_name = 'IV_MEASURE_UNIT_DICT') com1, " +
                " (SELECT code,name FROM zy_common_dict WHERE dict_name = 'IV_MEASURE_UNIT_DICT') com2, " +
                "  zy_iv_subject_class_dict class,  " +
                "  (  " +
                "    SELECT  " +
@@ -107,6 +97,9 @@ public class ZyDictService {
                "   p.subject_class, " +
                "   p.dose_unit, " +
                "   p.quantity_unit " +
                "   p.pack_unit " +
                "   p.min_dose " +
                "   p.pake_spec " +
                "    FROM  " +
                "   zy_iv_physic_dict p, " +
                "  ( " +