|  | @ -93,22 +93,24 @@ public class ZyDictService {
 | 
												
													
														
															|  |      * @return
 |  |      * @return
 | 
												
													
														
															|  |      */
 |  |      */
 | 
												
													
														
															|  |     public List<Map<String, Object>> findDictByDoctorAndName(String doctor,String name){
 |  |     public List<Map<String, Object>> findDictByDoctorAndName(String doctor,String name){
 | 
												
													
														
															|  |         String sql = "SELECT " +
 |  | 
 | 
												
													
														
															|  |                 " yp.physic_code drugCode, " +
 |  | 
 | 
												
													
														
															|  | 
 |  |         String sql = "SELECT  yp.physic_code drugCode, " +
 | 
												
													
														
															|  |                 " yp.physic_name drugName, " +
 |  |                 " yp.physic_name drugName, " +
 | 
												
													
														
															|  |                 " yp.physic_spec drugFormat, " +
 |  |                 " yp.physic_spec drugFormat, " +
 | 
												
													
														
															|  |                 " yp.subject_class subjectClass, " +
 |  |                 " yp.subject_class subjectClass, " +
 | 
												
													
														
															|  |                 " yp.pack_unit packUnit, " +
 |  |                 " yp.pack_unit packUnit, " +
 | 
												
													
														
															|  | 
 |  |                 " com3.`name` packUnitName, " +
 | 
												
													
														
															|  |                 " yp.min_dose minDose, " +
 |  |                 " yp.min_dose minDose, " +
 | 
												
													
														
															|  |                 " yp.pack_spec pakeSpec, " +
 |  |                 " yp.pack_spec pakeSpec, " +
 | 
												
													
														
															|  |                 " class.class_name className, " +
 |  |                 " class.class_name className, " +
 | 
												
													
														
															|  |                 " yp.dose_unit physicDoseUnit, " +
 |  |                 " yp.dose_unit physicDoseUnit, " +
 | 
												
													
														
															|  |                 " com1.`name` physicDoseUnitName, " +
 |  |                 " com1.`name` physicDoseUnitName, " +
 | 
												
													
														
															|  |                 " yp.quantity_unit drugNumUnit, " +
 |  |                 " yp.quantity_unit drugNumUnit, " +
 | 
												
													
														
															|  |                 " com2.`name` drugNumUnitName " +
 |  | 
 | 
												
													
														
															|  | 
 |  |                 " com2.`name` drugNumUnitName, " +
 | 
												
													
														
															|  | 
 |  |                 " yp.retail_price retailPrice " +
 | 
												
													
														
															|  |                 " FROM " +
 |  |                 " FROM " +
 | 
												
													
														
															|  |                 " (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') com1, " +
 | 
												
													
														
															|  |                 " (SELECT code,name 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') com2, " +
 | 
												
													
														
															|  | 
 |  |                 " (SELECT code,name FROM zy_common_dict WHERE dict_name = 'IV_MEASURE_UNIT_DICT') com3, " +
 | 
												
													
														
															|  |                 "  zy_iv_subject_class_dict class,  " +
 |  |                 "  zy_iv_subject_class_dict class,  " +
 | 
												
													
														
															|  |                 "  (  " +
 |  |                 "  (  " +
 | 
												
													
														
															|  |                 "    SELECT  " +
 |  |                 "    SELECT  " +
 | 
												
											
												
													
														
															|  | @ -120,7 +122,8 @@ public class ZyDictService {
 | 
												
													
														
															|  |                 "   p.quantity_unit, " +
 |  |                 "   p.quantity_unit, " +
 | 
												
													
														
															|  |                 "   p.pack_unit, " +
 |  |                 "   p.pack_unit, " +
 | 
												
													
														
															|  |                 "   p.min_dose, " +
 |  |                 "   p.min_dose, " +
 | 
												
													
														
															|  |                 "   p.pack_spec " +
 |  | 
 | 
												
													
														
															|  | 
 |  |                 "   p.pack_spec," +
 | 
												
													
														
															|  | 
 |  |                 "   p.retail_price " +
 | 
												
													
														
															|  |                 "    FROM  " +
 |  |                 "    FROM  " +
 | 
												
													
														
															|  |                 "   zy_iv_physic_dict p, " +
 |  |                 "   zy_iv_physic_dict p, " +
 | 
												
													
														
															|  |                 "  ( " +
 |  |                 "  ( " +
 | 
												
											
												
													
														
															|  | @ -147,6 +150,7 @@ public class ZyDictService {
 | 
												
													
														
															|  |                 "WHERE " +
 |  |                 "WHERE " +
 | 
												
													
														
															|  |                 " com1.`code` = yp.dose_unit " +
 |  |                 " com1.`code` = yp.dose_unit " +
 | 
												
													
														
															|  |                 " AND com2.`code` = yp.quantity_unit " +
 |  |                 " AND com2.`code` = yp.quantity_unit " +
 | 
												
													
														
															|  | 
 |  |                 " AND com3.`code` = yp.pack_unit " +
 | 
												
													
														
															|  |                 " AND class.class_code = yp.subject_class";
 |  |                 " AND class.class_code = yp.subject_class";
 | 
												
													
														
															|  | //        subjectClass
 |  | //        subjectClass
 | 
												
													
														
															|  | //        drugNumUnit":"224","drugNumUnitName":"支",
 |  | //        drugNumUnit":"224","drugNumUnitName":"支",
 |