中药盘点无厂家优化，修改异常

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpBaseYfMapper.java

@@ -242,11 +242,11 @@ public interface YpBaseYfMapper {
             "   group_no=b.group_no," +
             "   m.name as manufactoryName," +
             "   visible_flag = case when isnull(a.del_flag,'0')='0'or isnull(b.visible_flag_zy,'0')='0'or isnull(b.visible_flag_mz,'0')='0'then '0'else '1'end" +
-            " FROM yp_zd_dict a WITH(NOLOCK) ,yp_print_name c WITH(NOLOCK),yp_base_yf b WITH(NOLOCK),yp_zd_manufactory m WITH(NOLOCK)" +
+            " FROM yp_zd_dict a WITH(NOLOCK) left join yp_zd_manufactory m WITH(NOLOCK) on a.manu_code = m.code" +
+            ",yp_print_name c WITH(NOLOCK),yp_base_yf b WITH(NOLOCK)" +
             " where a.code=b.charge_code and" +
             "    a.serial=b.serial and" +
             "    a.code  =c.charge_code and" +
-            "    a.manu_code = m.code and" +
             "    b.group_no=#{groupNo} and" +
             "    isnull(a.infusion_flag,'0') like '${infusionFlag}%')ab " +
             " where visible_flag like '${visibleFlag}%' order by location")

src/main/java/cn/hnthyy/thmz/mapper/his/zy/YpZyPatientMapper.java

@@ -83,22 +83,22 @@ public interface YpZyPatientMapper {
             "page_no=#{pageNo}",
             "</when>",
             "<when test='keeper!=null'>",
-            "keeper=#{keeper}",
+            ",keeper=#{keeper}",
             "</when>",
             "<when test='confirmTime!=null'>",
-            "confirm_time=#{confirmTime}",
+            ",confirm_time=#{confirmTime}",
             "</when>",
             "<when test='doctorName!=null'>",
-            "doctor_name=#{doctorName}",
+            ",doctor_name=#{doctorName}",
             "</when>",
             "<when test='pageType!=null'>",
-            "page_type=#{pageType}",
+            ",page_type=#{pageType}",
             "</when>",
             "<when test='jyFlag!=null'>",
-            "jy_flag=#{jyFlag}",
+            ",jy_flag=#{jyFlag}",
             "</when>",
             "<when test='manuNo!=null'>",
-            "manu_no=#{manuNo}",
+            ",manu_no=#{manuNo}",
             "</when>",
             "</trim>" +
             "where act_order_no = #{actOrderNo} and charge_code = #{chargeCode} and inpatient_no=#{inpatientNo} and order_date=#{orderDate}",