pad接口-请领单-已提交请领单物料信息查询增加返回内容：物料的一、二级分类

nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldInfoEntity.java

@@ -52,4 +52,9 @@ public class InvoicingQldInfoEntity implements Serializable {
      * 物料信息
      */
     private MaterialInfoEntity materialInfo;
+
+    /**服务类别名称*/
+    private String categoryName;
+    /**服务类型名称*/
+    private String typeName;
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml

@@ -40,11 +40,15 @@
         material.lower_limit AS "materialInfo.lowerLimit",
         material.tag_type AS "materialInfo.tagType",
         material.iz_ybbx AS "materialInfo.izYbbx",
-        material.iz_jgyh AS "materialInfo.izJgyh"
+        material.iz_jgyh AS "materialInfo.izJgyh",
+        maca.category_name as "materialInfo.categoryName",
+        maty.type_name as "materialInfo.typeName"
         FROM
         nu_invoicing_qld_info info
         LEFT JOIN
         nu_config_material_info material ON info.wl_id = material.id
+        LEFT JOIN nu_config_material_category maca ON material.category_id = maca.id
+        LEFT JOIN nu_config_material_type maty ON material.type_id = maty.id
         WHERE
         info.qld_no IN
         <foreach collection="qldNo.split(',')" item="no" open="(" close=")" separator=",">
@@ -52,7 +56,9 @@
         </foreach>
         GROUP BY
         info.wl_id,
-        material.id
+        material.id,
+        maca.id,
+        maty.id
         ORDER BY
         MAX(info.create_time) DESC
     </select>