配方使用明细的HIS药品代码

处方统计（新都）金额去除小数

cbkj_web_api/src/main/resources/mappers/formula/TFormulaMapper.xml

@@ -357,8 +357,8 @@
                f.PRE_WB,
                f.EFFICACY,
                f.PRE_TYPE,
-               f.PRE_MAT_TYPE,
-               f.STORE_ID,
+<!--               f.PRE_MAT_TYPE,-->
+<!--               f.STORE_ID,-->
                f.PRE_NUM,
                f.PRE_DESCRIPTION_ID,
                f.PRE_DESCRIPTION,
@@ -399,7 +399,8 @@
 
                kc.KUCUNSL,
                kc.LINGSHOUJIA as MAT_XSJ,
-               (select map.YPDM_HIS from t_center_his_mapping map where map.IS_DEL = '0' AND map.YAOPINDM_TY = i.YAOPINDM_TY AND map.YPML_ID_HIS = #{ypmlHis} limit 1) YPDM_HIS,
+<!--               (select map.YPDM_HIS from t_center_his_mapping map where map.IS_DEL = '0' AND map.YAOPINDM_TY = i.YAOPINDM_TY AND map.YPML_ID_HIS = #{ypmlHis} limit 1) YPDM_HIS,-->
+                i.YPDM_HIS,
                (select sum(a.PRE_STOCK) from t_formula_auth a where a.FORMULA_ID = f.FORMULA_ID ) PRE_STOCK
 
         from t_formula f

cbkj_web_api/src/main/resources/mappers/statistics/PrescriptionStatisticsMapper.xml

@@ -105,8 +105,8 @@
             WHEN '2' THEN CONCAT_WS('，', p.PRE_SMOKE_TYPE, PRE_FREQUENCY, CONCAT('每袋', PRE_N_ML, 'ml'))
         END PRE_DESCRIPTION,
         p.PRE_NUM,
-        CONVERT(p.MAT_TOL_MONEY, DECIMAL(10,2)),
-        CONVERT(p.PRE_TOL_MONEY, DECIMAL(10,2)),
+        CONVERT(p.MAT_TOL_MONEY, DECIMAL(10,2)) MAT_TOL_MONEY,
+        CONVERT(p.PRE_TOL_MONEY, DECIMAL(10,2)) PRE_TOL_MONEY,
         i.YPMC_HIS,
         i.MAT_DOSE,
         i.BZDW_HIS,