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

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

@@ -483,6 +483,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        jsonObject.put("socialSecurityCardNum", mediicineorder.getSocialSecurityCardNum());
        jsonObject.put("doctorName", mediicineorder.getDoctorName());
        jsonObject.put("infoAccess", mediicineorder.getInfoAccess());
        jsonObject.put("reviewerState", mediicineorder.getReviewerState());
        jsonObject.put("reviewerContent", mediicineorder.getReviewerContent());
        jsonObject.put("orderTypeName", orderTypeMap.get(mediicineorder.getOrderType()));
        //取药码
        jsonObject.put("pickUpNum", mediicineorder.getPickUpNum());