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/consult/PatientConsultEndpoint.java

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

@@ -171,7 +171,7 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        outpatientDO.setIdcard(patientDO.getIdcard());
        outpatientDO.setOutpatientType("1");
        outpatientDO.setCreateTime(new Date());
        if (payFlag){
        if (!payFlag){
            outpatientDO.setPayStatus(1);
        }else {
            outpatientDO.setPayStatus(0);

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1087,8 +1087,12 @@ public class ImService {
			if (wxId.equalsIgnoreCase("xm_ykyy_wx")){
				//眼科接诊时更新眼科通状态
				BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(wlyyOutpatientDO.getId());
				ykyyService.updateYktOrderStatus(businessOrderDO.getOrderNo(),"5");
				if (!flag){
					BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(wlyyOutpatientDO.getId());
					if (businessOrderDO!=null){
						ykyyService.updateYktOrderStatus(businessOrderDO.getOrderNo(),"5");
					}
				}
			}