Merge branch 'medicare' of liubing/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedOrderService.java

@@ -893,7 +893,7 @@ public class MedOrderService {
                                                ylzMedicalMxDO.setSpecificationType(SETTLE_DETAIL_OBJ.getString("ITEM_SPEC"));//规格型号
                                                ylzMedicalMxDO.setDosageForm(SETTLE_DETAIL_OBJ.getString("PHYSIC_FORM"));//剂型
                                                ylzMedicalMxDO.setChargeUnit(SETTLE_DETAIL_OBJ.getString("ITEM_UNIT"));//单位
                                                ylzMedicalMxDO.setChargeUnitName(SETTLE_DETAIL_OBJ.getString("INSUR_ITEM_UNIT_NAME"));//单位名称
                                                ylzMedicalMxDO.setChargeUnitName(SETTLE_DETAIL_OBJ.getString("ITEM_UNIT_NAME"));//单位名称
                                                ylzMedicalMxDO.setPrice(null==SETTLE_DETAIL_OBJ.get("INSUR_ITEM_PRICE")?"0.0":SETTLE_DETAIL_OBJ.getString("INSUR_ITEM_PRICE"));//单价
                                                ylzMedicalMxDO.setAmount(SETTLE_DETAIL_OBJ.getString("ITEM_QUANTITY"));//数量