Merge branch 'dev-1.1.4' into 'dev-1.1.4'

退药优化

See merge request lihong/thmz_system!61

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -232,7 +232,8 @@ public class MzPharmacyController {
             List<Map<String, Object>> ypMzFytjList = mzPharmacyService.getPrescriptionYpMx(chargeFeeParamsVo);
             for (Map<String, Object> stringObjectMap : ypMzFytjListRefund) {
                 for (Map<String, Object> objectMap : ypMzFytjList) {
-                    if (stringObjectMap.get("item_no").equals(objectMap.get("item_no"))) {
+                    if (stringObjectMap.get("charge_item_code").equals(objectMap.get("charge_item_code"))
+                            && stringObjectMap.get("item_no").equals(objectMap.get("item_no"))) {
                         objectMap.put("dec_amount", stringObjectMap.get("quantity"));
                     }
                 }