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/PrescriptionExpressageService.java

@@ -86,6 +86,9 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
    @Autowired
    private BasePatientDao basePatientDao;
    @Autowired
    private PrescriptionLogDao prescriptionLogDao;
    @Autowired
    private SfConfigDao sfConfigDao;
@@ -601,6 +604,25 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
                    prescriptionDao.save(wlyyPrescriptionDO);
                }*/
                //处方日志
                for (int i=0;i<sfprescription.size();i++){
                    WlyyPrescriptionDO prescriptionDO = sfprescription.get(i);
                    if (prescriptionDO.getStatus()>=32){
                        WlyyPrescriptionLogDO prescriptionLogDO = new WlyyPrescriptionLogDO();
                        prescriptionLogDO.setCreateTime(new Date());
                        prescriptionLogDO.setStatus(100);
                        prescriptionLogDO.setOutpatientId(prescriptionDO.getOutpatientId());
                        prescriptionLogDO.setPrescriptionCode(prescriptionDO.getPatientCode());
                        prescriptionLogDO.setUserCode(prescriptionDO.getPatientCode());
                        prescriptionLogDO.setUserName(prescriptionDO.getPatientName());
                        prescriptionLogDO.setUserType(1);
                        prescriptionLogDO.setDatajson("处方完成");
                        prescriptionLogDao.save(prescriptionLogDO);
                        logger.info("更新处方日志");
                    }
                }
                //保存配送成功的日志
                WlyyOutpatientExpressageLogDO outpatiExpressLog = new WlyyOutpatientExpressageLogDO();