Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/wechat/WechatMenuController.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/TnPrescriptionService.java

@@ -493,12 +493,12 @@ public class TnPrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pr
            object.put("charge_code",map.get("YPXH"));
            object.put("drugname",map.get("YPMC"));
            object.put("specification",map.get("YPGG"));
            object.put("pack_unit_name",map.get("JLDW"));
            object.put("pack_unit_name",map.get("YPDW"));
            object.put("mini_unit",map.get("UNITCODE"));
            object.put("mini_unit_name",map.get("UNITCODENAME"));
            object.put("weigh_unit_name",map.get("ZXDW"));
            object.put("weigh_unit",map.get("ZXDW"));
            object.put("pack_unit",map.get("YFBZ"));
            object.put("pack_unit",map.get("YPDW"));
            object.put("yfdw",map.get("YFDW"));
            object.put("pack_size",map.get("YFBZ"));
         /*   object.put("yfsx",map.get("yfsx"));//药房属性*/